diff --git a/doc/Makefile b/doc/Makefile index cd6d7eb8d1c8..5badfe4138d4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -78,15 +78,14 @@ manual-full.xml: ${MD_TARGETS} .version functions/library/locations.xml function nix-instantiate --eval \ -E '(import ../lib).version' > .version -function_locations := $(shell nix-build --no-out-link ./lib-function-locations.nix) - functions/library/locations.xml: - ln -s $(function_locations) ./functions/library/locations.xml + nix-build ./lib-function-locations.nix \ + --out-link $@ -functions/library/generated: +functions/library/generated: functions/library/locations.xml nix-build ./lib-function-docs.nix \ - --arg locationsXml $(function_locations)\ - --out-link ./functions/library/generated + --arg locationsXml $< \ + --out-link $@ %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index dbaf6f104ec0..b7844da195d7 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -12,11 +12,12 @@ computing power and memory to compile their own programs. One might think that cross-compilation is a fairly niche concern. However, there are significant advantages to rigorously distinguishing between build-time and - run-time environments! This applies even when one is developing and - deploying on the same machine. Nixpkgs is increasingly adopting the opinion - that packages should be written with cross-compilation in mind, and nixpkgs - should evaluate in a similar way (by minimizing cross-compilation-specific - special cases) whether or not one is cross-compiling. + run-time environments! Significant, because the benefits apply even when one + is developing and deploying on the same machine. Nixpkgs is increasingly + adopting the opinion that packages should be written with cross-compilation + in mind, and nixpkgs should evaluate in a similar way (by minimizing + cross-compilation-specific special cases) whether or not one is + cross-compiling. @@ -30,7 +31,7 @@
Packaging in a cross-friendly manner -
+
Platform parameters @@ -218,8 +219,20 @@
-
- Specifying Dependencies +
+ Theory of dependency categorization + + + + This is a rather philosophical description that isn't very + Nixpkgs-specific. For an overview of all the relevant attributes given to + mkDerivation, see + . For a description of how + everything is implemented, see + . + + In this section we explore the relationship between both runtime and @@ -227,84 +240,98 @@ - A runtime dependency between 2 packages implies that between them both the - host and target platforms match. This is directly implied by the meaning of - "host platform" and "runtime dependency": The package dependency exists - while both packages are running on a single host platform. + A run time dependency between two packages requires that their host + platforms match. This is directly implied by the meaning of "host platform" + and "runtime dependency": The package dependency exists while both packages + are running on a single host platform. - A build time dependency, however, implies a shift in platforms between the - depending package and the depended-on package. The meaning of a build time - dependency is that to build the depending package we need to be able to run - the depended-on's package. The depending package's build platform is - therefore equal to the depended-on package's host platform. Analogously, - the depending package's host platform is equal to the depended-on package's - target platform. + A build time dependency, however, has a shift in platforms between the + depending package and the depended-on package. "build time dependency" + means that to build the depending package we need to be able to run the + depended-on's package. The depending package's build platform is therefore + equal to the depended-on package's host platform. - In this manner, given the 3 platforms for one package, we can determine the - three platforms for all its transitive dependencies. This is the most - important guiding principle behind cross-compilation with Nixpkgs, and will - be called the sliding window principle. + If both the dependency and depending packages aren't compilers or other + machine-code-producing tools, we're done. And indeed + buildInputs and nativeBuildInputs + have covered these simpler build-time and run-time (respectively) changes + for many years. But if the dependency does produce machine code, we might + need to worry about its target platform too. In principle, that target + platform might be any of the depending package's build, host, or target + platforms, but we prohibit dependencies from a "later" platform to an + earlier platform to limit confusion because we've never seen a legitimate + use for them. - Some examples will make this clearer. If a package is being built with a - (build, host, target) platform triple of (foo, - bar, bar), then its build-time dependencies would have a triple - of (foo, foo, bar), and those - packages' build-time dependencies would have a triple of - (foo, foo, foo). In other words, it should take two - "rounds" of following build-time dependency edges before one reaches a - fixed point where, by the sliding window principle, the platform triple no - longer changes. Indeed, this happens with cross-compilation, where only - rounds of native dependencies starting with the second necessarily coincide - with native packages. + Finally, if the depending package is a compiler or other + machine-code-producing tool, it might need dependencies that run at "emit + time". This is for compilers that (regrettably) insist on being built + together with their source langauges' standard libraries. Assuming build != + host != target, a run-time dependency of the standard library cannot be run + at the compiler's build time or run time, but only at the run time of code + emitted by the compiler. - - - The depending package's target platform is unconstrained by the sliding - window principle, which makes sense in that one can in principle build - cross compilers targeting arbitrary platforms. - - - - How does this work in practice? Nixpkgs is now structured so that - build-time dependencies are taken from buildPackages, - whereas run-time dependencies are taken from the top level attribute set. - For example, buildPackages.gcc should be used at - build-time, while gcc should be used at run-time. Now, - for most of Nixpkgs's history, there was no - buildPackages, and most packages have not been - refactored to use it explicitly. Instead, one can use the six - (gasp) attributes used for specifying dependencies as - documented in . We "splice" - together the run-time and build-time package sets with - callPackage, and then mkDerivation - for each of four attributes pulls the right derivation out. This splicing - can be skipped when not cross-compiling as the package sets are the same, - but is a bit slow for cross-compiling. Because of this, a - best-of-both-worlds solution is in the works with no splicing or explicit - access of buildPackages needed. For now, feel free to - use either method. + Putting this all together, that means we have dependencies in the form + "host → target", in at most the following six combinations: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Possible dependency types
Dependency's host platformDependency's target platform
buildbuild
buildhost
buildtarget
hosthost
hosttarget
targettarget
 - - - There is also a "backlink" targetPackages, yielding a - package set whose buildPackages is the current package - set. This is a hack, though, to accommodate compilers with lousy build - systems. Please do not use this unless you are absolutely sure you are - packaging such a compiler and there is no other way. - - + + Some examples will make this table clearer. Suppose there's some package + that is being built with a (build, host, target) + platform triple of (foo, bar, baz). If it has a + build-time library dependency, that would be a "host → build" dependency + with a triple of (foo, foo, *) (the target platform is + irrelevant). If it needs a compiler to be built, that would be a "build → + host" dependency with a triple of (foo, foo, *) (the + target platform is irrelevant). That compiler, would be built with another + compiler, also "build → host" dependency, with a triple of (foo, + foo, foo). +
-
+
Cross packaging cookbook @@ -450,21 +477,202 @@ nix-build <nixpkgs> --arg crossSystem '{ config = "<arch>-<os>
Cross-compilation infrastructure - - To be written. - +
+ Implementation of dependencies - - If one explores Nixpkgs, they will see derivations with names like - gccCross. Such *Cross derivations is - a holdover from before we properly distinguished between the host and - target platforms—the derivation with "Cross" in the name covered the - build = host != target case, while the other covered the - host = target, with build platform the same or not based - on whether one was using its .nativeDrv or - .crossDrv. This ugliness will disappear soon. + The categorizes of dependencies developed in + are specified as + lists of derivations given to mkDerivation, as + documented in . In short, + each list of dependencies for "host → target" of "foo → bar" is called + depsFooBar, with exceptions for backwards + compatibility that depsBuildHost is instead called + nativeBuildInputs and depsHostTarget + is instead called buildInputs. Nixpkgs is now structured + so that each depsFooBar is automatically taken from + pkgsFooBar. (These pkgsFooBars are + quite new, so there is no special case for + nativeBuildInputs and buildInputs.) + For example, pkgsBuildHost.gcc should be used at + build-time, while pkgsHostTarget.gcc should be used at + run-time. - + + + Now, for most of Nixpkgs's history, there were no + pkgsFooBar attributes, and most packages have not been + refactored to use it explicitly. Prior to those, there were just + buildPackages, pkgs, and + targetPackages. Those are now redefined as aliases to + pkgsBuildHost, pkgsHostTarget, and + pkgsTargetTarget. It is acceptable, even + recommended, to use them for libraries to show that the host platform is + irrelevant. + + + + But before that, there was just pkgs, even though both + buildInputs and nativeBuildInputs + existed. [Cross barely worked, and those were implemented with some hacks + on mkDerivation to override dependencies.] What this + means is the vast majority of packages do not use any explicit package set + to populate their dependencies, just using whatever + callPackage gives them even if they do correctly sort + their dependencies into the multiple lists described above. And indeed, + asking that users both sort their dependencies, and + take them from the right attribute set, is both too onerous and redundant, + so the recommended approach (for now) is to continue just categorizing by + list and not using an explicit package set. + + + + To make this work, we "splice" together the six + pkgsFooBar package sets and have + callPackage actually take its arguments from that. This + is currently implemented in pkgs/top-level/splice.nix. + mkDerivation then, for each dependency attribute, pulls + the right derivation out from the splice. This splicing can be skipped when + not cross-compiling as the package sets are the same, but still is a bit + slow for cross-compiling. We'd like to do something better, but haven't + come up with anything yet. + +
+ +
+ Bootstrapping + + + Each of the package sets described above come from a single bootstrapping + stage. While pkgs/top-level/default.nix, coordinates + the composition of stages at a high level, + pkgs/top-level/stage.nix "ties the knot" (creates the + fixed point) of each stage. The package sets are defined per-stage however, + so they can be thought of as edges between stages (the nodes) in a graph. + Compositions like pkgsBuildTarget.targetPackages can be + thought of as paths to this graph. + + + + While there are many package sets, and thus many edges, the stages can also + be arranged in a linear chain. In other words, many of the edges are + redundant as far as connectivity is concerned. This hinges on the type of + bootstrapping we do. Currently for cross it is: + + + + (native, native, native) + + + + + (native, native, foreign) + + + + + (native, foreign, foreign) + + + + In each stage, pkgsBuildHost refers the the previous + stage, pkgsBuildBuild refers to the one before that, and + pkgsHostTarget refers to the current one, and + pkgsTargetTarget refers to the next one. When there is + no previous or next stage, they instead refer to the current stage. Note + how all the invariants regarding the mapping between dependency and depending + packages' build host and target platforms are preserved. + pkgsBuildTarget and pkgsHostHost are + more complex in that the stage fitting the requirements isn't always a + fixed chain of "prevs" and "nexts" away (modulo the "saturating" + self-references at the ends). We just special case each instead. All the primary + edges are implemented is in pkgs/stdenv/booter.nix, + and secondarily aliases in pkgs/top-level/stage.nix. + + + + + Note the native stages are bootstrapped in legacy ways that predate the + current cross implementation. This is why the the bootstrapping stages + leading up to the final stages are ignored inthe previous paragraph. + + + + + If one looks at the 3 platform triples, one can see that they overlap such + that one could put them together into a chain like: + +(native, native, native, foreign, foreign) + + If one imagines the saturating self references at the end being replaced + with infinite stages, and then overlays those platform triples, one ends up + with the infinite tuple: + +(native..., native, native, native, foreign, foreign, foreign...) + + On can then imagine any sequence of platforms such that there are bootstrap + stages with their 3 platforms determined by "sliding a window" that is the + 3 tuple through the sequence. This was the original model for + bootstrapping. Without a target platform (assume a better world where all + compilers are multi-target and all standard libraries are built in their + own derivation), this is sufficient. Conversely if one wishes to cross + compile "faster", with a "Canadian Cross" bootstraping stage where + build != host != target, more bootstrapping stages are + needed since no sliding window providess the pesky + pkgsBuildTarget package set since it skips the Canadian + cross stage's "host". + + + + + It is much better to refer to buildPackages than + targetPackages, or more broadly package sets that do + not mention "target". There are three reasons for this. + + + First, it is because bootstrapping stages do not have a unique + targetPackages. For example a (x86-linux, + x86-linux, arm-linux) and (x86-linux, x86-linux, + x86-windows) package set both have a (x86-linux, + x86-linux, x86-linux) package set. Because there is no canonical + targetPackages for such a native (build == + host == target) package set, we set their + targetPackages + + + Second, it is because this is a frequent source of hard-to-follow + "infinite recursions" / cycles. When only package sets that don't mention + target are used, the package set forms a directed acyclic graph. This + means that all cycles that exist are confined to one stage. This means + they are a lot smaller, and easier to follow in the code or a backtrace. It + also means they are present in native and cross builds alike, and so more + likely to be caught by CI and other users. + + + Thirdly, it is because everything target-mentioning only exists to + accommodate compilers with lousy build systems that insist on the compiler + itself and standard library being built together. Of course that is bad + because bigger derivations means longer rebuilds. It is also problematic because + it tends to make the standard libraries less like other libraries than + they could be, complicating code and build systems alike. Because of the + other problems, and because of these innate disadvantages, compilers ought + to be packaged another way where possible. + + + + + + If one explores Nixpkgs, they will see derivations with names like + gccCross. Such *Cross derivations is + a holdover from before we properly distinguished between the host and + target platforms—the derivation with "Cross" in the name covered the + build = host != target case, while the other covered + the host = target, with build platform the same or not + based on whether one was using its .nativeDrv or + .crossDrv. This ugliness will disappear soon. + + +
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index 029299a50b1e..6e3b6face3a5 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -189,7 +189,8 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD - The nix-review + The + nix-review tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end of the pull request title. You can also provide the full github pull diff --git a/doc/stdenv.xml b/doc/stdenv.xml index a3990dec052f..74f815fc1d79 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -222,9 +222,10 @@ genericBuild But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes - perfect sense outside of cross compilation. For now, the run-time/build-time - distinction is just a hint for mental clarity, but in the future it perhaps - could be enforced. + perfect sense outside of cross compilation. By default, the + run-time/build-time distinction is just a hint for mental clarity, but with + strictDeps set it is mostly enforced even in the native + case. @@ -348,7 +349,10 @@ let f(h, h + 1, i) = i + h Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the depending - package is unaware of. The offset bounds checking and definition of + package is unaware of. [One can imagine the dependending package asking for + dependencies with the platforms it knows about; other platforms it doesn't + know how to ask for. The platform description in that scenario is a kind of + unforagable capability.] The offset bounds checking and definition of mapOffset together ensure that this is the case. Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they @@ -2633,21 +2637,20 @@ addEnvHooks "$hostOffset" myBashFunction happens. It prevents nix from cleaning up the build environment immediately and allows the user to attach to a build environment using the cntr command. Upon build error it will print - instructions on how to use cntr, which can be used - to enter the environment for debugging. Installing cntr and - running the command will provide shell access to the build sandbox of - failed build. At /var/lib/cntr the sandboxed - filesystem is mounted. All commands and files of the system are still - accessible within the shell. To execute commands from the sandbox use - the cntr exec subcommand. Note that cntr also needs - to be executed on the machine that is doing the build, which might not - be the case when remote builders are enabled. cntr is - only supported on Linux-based platforms. To use it first add - cntr to your - environment.systemPackages on NixOS or alternatively - to the root user on non-NixOS systems. Then in the package that is - supposed to be inspected, add breakpointHook to - nativeBuildInputs. + instructions on how to use cntr, which can be used to + enter the environment for debugging. Installing cntr and running the + command will provide shell access to the build sandbox of failed build. + At /var/lib/cntr the sandboxed filesystem is + mounted. All commands and files of the system are still accessible + within the shell. To execute commands from the sandbox use the cntr exec + subcommand. Note that cntr also needs to be executed + on the machine that is doing the build, which might not be the case when + remote builders are enabled. cntr is only supported + on Linux-based platforms. To use it first add cntr to + your environment.systemPackages on NixOS or + alternatively to the root user on non-NixOS systems. Then in the package + that is supposed to be inspected, add breakpointHook + to nativeBuildInputs. nativeBuildInputs = [ breakpointHook ]; diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml index 33abfb634ea2..bc090fd757ce 100644 --- a/doc/submitting-changes.xml +++ b/doc/submitting-changes.xml @@ -354,23 +354,22 @@ Additional information. Tested compilation of all pkgs that depend on this change using <command>nix-review</command> - If you are updating a package's version, you can use nix-review to make sure all - packages that depend on the updated package still compile correctly. - The nix-review utility can look for and build all dependencies - either based on uncommited changes with the wip option or - specifying a github pull request number. + If you are updating a package's version, you can use nix-review to make + sure all packages that depend on the updated package still compile + correctly. The nix-review utility can look for and build + all dependencies either based on uncommited changes with the + wip option or specifying a github pull request number. - review changes from pull request number 12345: - nix-shell -p nix-review --run "nix-review pr 12345" + review changes from pull request number 12345: +nix-shell -p nix-review --run "nix-review pr 12345" - review uncommitted changes: - nix-shell -p nix-review --run "nix-review wip" + review uncommitted changes: +nix-shell -p nix-review --run "nix-review wip" -
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index be9884fe9dce..c9acbefea60e 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -27,8 +27,13 @@ nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded ... The first column in the output is the attribute name, - such as nixos.thunderbird. (The nixos - prefix allows distinguishing between different channels that you might have.) + such as nixos.thunderbird. + + + Note: the nixos prefix tells us that we want to get the + package from the nixos channel and works only in CLI tools. + + In declarative configuration use pkgs prefix (variable). diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 83d097457abc..b758e1333095 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -55,6 +55,23 @@ + + + Buildbot no longer supports Python 2, as support was dropped upstream in + version 2.0.0. Configurations may need to be modified to make them + compatible with Python 3. + + + + + PostgreSQL now uses + /run/postgresql as its socket + directory instead of /tmp. So + if you run an application like eg. Nextcloud, where you need to use + the Unix socket path as the database host name, you need to change it + accordingly. + + The NetworkManager systemd unit was renamed back from network-manager.service to diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0f3c9d0c5627..dc571602581b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -880,6 +880,7 @@ ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/docker.nix + ./virtualisation/docker-containers.nix ./virtualisation/ecs-agent.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 14bf118f2d84..997328ad9e6a 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -76,7 +76,7 @@ in }; failmode = mkOption { - type = types.enum [ "safe" "enum" ]; + type = types.enum [ "safe" "secure" ]; default = "safe"; description = '' On service or configuration errors that prevent Duo diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index 0f07e6133bb5..9c615fbe885f 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -199,10 +199,10 @@ in { package = mkOption { type = types.package; - default = pkgs.pythonPackages.buildbot-full; - defaultText = "pkgs.pythonPackages.buildbot-full"; + default = pkgs.python3Packages.buildbot-full; + defaultText = "pkgs.python3Packages.buildbot-full"; description = "Package to use for buildbot."; - example = literalExample "pkgs.python3Packages.buildbot-full"; + example = literalExample "pkgs.python3Packages.buildbot"; }; packages = mkOption { diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index 4130ec918a70..49e04ca36228 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -118,10 +118,10 @@ in { package = mkOption { type = types.package; - default = pkgs.pythonPackages.buildbot-worker; - defaultText = "pkgs.pythonPackages.buildbot-worker"; + default = pkgs.python3Packages.buildbot-worker; + defaultText = "pkgs.python3Packages.buildbot-worker"; description = "Package to use for buildbot worker."; - example = literalExample "pkgs.python3Packages.buildbot-worker"; + example = literalExample "pkgs.python2Packages.buildbot-worker"; }; packages = mkOption { diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index aeab445a9983..87b236dd5fd1 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -238,6 +238,7 @@ in User = "postgres"; Group = "postgres"; PermissionsStartOnly = true; + RuntimeDirectory = "postgresql"; Type = if lib.versionAtLeast cfg.package.version "9.6" then "notify" else "simple"; diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix index cf26e05d5c18..5ab9add9f32d 100644 --- a/nixos/modules/services/desktops/gsignond.nix +++ b/nixos/modules/services/desktops/gsignond.nix @@ -9,6 +9,8 @@ let in { + meta.maintainers = pkgs.pantheon.maintainers; + ###### interface options = { diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix index bd538db72413..2638a21df733 100644 --- a/nixos/modules/services/desktops/pantheon/contractor.nix +++ b/nixos/modules/services/desktops/pantheon/contractor.nix @@ -6,6 +6,8 @@ with lib; { + meta.maintainers = pkgs.pantheon.maintainers; + ###### interface options = { diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix index 2edbe5b3a6db..577aad6c2987 100644 --- a/nixos/modules/services/desktops/pantheon/files.nix +++ b/nixos/modules/services/desktops/pantheon/files.nix @@ -6,6 +6,8 @@ with lib; { + meta.maintainers = pkgs.pantheon.maintainers; + ###### interface options = { diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index f3d90e532c88..c87607d2666a 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -14,9 +14,10 @@ let log.fields.service = "registry"; storage = { cache.blobdescriptor = blobCache; - filesystem.rootdirectory = cfg.storagePath; delete.enabled = cfg.enableDelete; - }; + } // (if cfg.storagePath != null + then { filesystem.rootdirectory = cfg.storagePath; } + else {}); http = { addr = "${cfg.listenAddress}:${builtins.toString cfg.port}"; headers.X-Content-Type-Options = ["nosniff"]; @@ -61,9 +62,12 @@ in { }; storagePath = mkOption { - type = types.path; + type = types.nullOr types.path; default = "/var/lib/docker-registry"; - description = "Docker registry storage path."; + description = '' + Docker registry storage path for the filesystem storage backend. Set to + null to configure another backend via extraConfig. + ''; }; enableDelete = mkOption { @@ -140,9 +144,12 @@ in { startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates; }; - users.users.docker-registry = { - createHome = true; - home = cfg.storagePath; - }; + users.users.docker-registry = + if cfg.storagePath != null + then { + createHome = true; + home = cfg.storagePath; + } + else {}; }; } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index baa1c855c116..17c8c3ce51f4 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -160,6 +160,8 @@ let ''; }; + extraGitlabRb = pkgs.writeText "extra-gitlab.rb" cfg.extraGitlabRb; + smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" '' if Rails.env.production? Rails.application.config.action_mailer.delivery_method = :smtp @@ -266,6 +268,26 @@ in { description = "Extra configuration in config/database.yml."; }; + extraGitlabRb = mkOption { + type = types.str; + default = ""; + example = '' + if Rails.env.production? + Rails.application.config.action_mailer.delivery_method = :sendmail + ActionMailer::Base.delivery_method = :sendmail + ActionMailer::Base.sendmail_settings = { + location: "/run/wrappers/bin/sendmail", + arguments: "-i -t" + } + end + ''; + description = '' + Extra configuration to be placed in config/extra-gitlab.rb. This can + be used to add configuration not otherwise exposed through this module's + options. + ''; + }; + host = mkOption { type = types.str; default = config.networking.hostName; @@ -586,6 +608,7 @@ in { [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config + ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb ${optionalString cfg.smtp.enable '' ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb ''} diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index b06c1c4bbc68..fce9b29011f1 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -146,7 +146,7 @@ in PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6"; PLEX_MEDIA_SERVER_TMPDIR="/tmp"; PLEX_MEDIA_SERVER_USE_SYSLOG="true"; - LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver"; + LD_LIBRARY_PATH="/run/opengl-driver/lib:${cfg.package}/usr/lib/plexmediaserver/lib"; LC_ALL="en_US.UTF-8"; LANG="en_US.UTF-8"; }; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index aba64e4f60ff..4ea891262e56 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -261,10 +261,14 @@ let fi ''; + canonicalizePortList = + ports: lib.unique (builtins.sort builtins.lessThan ports); + commonOptions = { allowedTCPPorts = mkOption { - type = types.listOf types.int; + type = types.listOf types.port; default = [ ]; + apply = canonicalizePortList; example = [ 22 80 ]; description = '' @@ -274,7 +278,7 @@ let }; allowedTCPPortRanges = mkOption { - type = types.listOf (types.attrsOf types.int); + type = types.listOf (types.attrsOf types.port); default = [ ]; example = [ { from = 8999; to = 9003; } ]; description = @@ -285,8 +289,9 @@ let }; allowedUDPPorts = mkOption { - type = types.listOf types.int; + type = types.listOf types.port; default = [ ]; + apply = canonicalizePortList; example = [ 53 ]; description = '' @@ -295,7 +300,7 @@ let }; allowedUDPPortRanges = mkOption { - type = types.listOf (types.attrsOf types.int); + type = types.listOf (types.attrsOf types.port); default = [ ]; example = [ { from = 60000; to = 61000; } ]; description = diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 5ad241ace5c8..eedcccac723c 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -172,7 +172,7 @@ in { Database host. Note: for using Unix authentication with PostgreSQL, this should be - set to /tmp. + set to /run/postgresql. ''; }; dbport = mkOption { diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 098625aa02f2..dfefa55c5d5e 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -33,7 +33,7 @@ config = { dbtype = "pgsql"; dbuser = "nextcloud"; - dbhost = "/tmp"; # nextcloud will add /.s.PGSQL.5432 by itself + dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself dbname = "nextcloud"; adminpassFile = "/path/to/admin-pass-file"; adminuser = "root"; diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix index 11aebcb91d88..5a00070dc941 100644 --- a/nixos/modules/services/web-servers/meguca.nix +++ b/nixos/modules/services/web-servers/meguca.nix @@ -86,11 +86,19 @@ in with lib; { default = false; description = "Serve and listen only through HTTPS."; }; + + videoPaths = mkOption { + type = types.listOf types.path; + default = []; + example = [ "/home/okina/Videos/tehe_pero.webm" ]; + description = "Videos that will be symlinked into www/videos."; + }; }; config = mkIf cfg.enable { security.sudo.enable = cfg.enable; services.postgresql.enable = cfg.enable; + services.postgresql.package = pkgs.postgresql_11; services.meguca.passwordFile = mkDefault (pkgs.writeText "meguca-password-file" cfg.password); services.meguca.postgresArgsFile = mkDefault (pkgs.writeText "meguca-postgres-args" cfg.postgresArgs); services.meguca.postgresArgs = mkDefault "user=meguca password=${cfg.password} dbname=meguca sslmode=disable"; @@ -102,8 +110,16 @@ in with lib; { preStart = '' # Ensure folder exists or create it and links and permissions are correct - mkdir -p ${escapeShellArg cfg.dataDir} - ln -sf ${pkgs.meguca}/share/meguca/www ${escapeShellArg cfg.dataDir} + mkdir -p ${escapeShellArg cfg.dataDir}/www + rm -rf ${escapeShellArg cfg.dataDir}/www/videos + ln -sf ${pkgs.meguca}/share/meguca/www/* ${escapeShellArg cfg.dataDir}/www + unlink ${escapeShellArg cfg.dataDir}/www/videos + mkdir -p ${escapeShellArg cfg.dataDir}/www/videos + + for vid in ${escapeShellArg cfg.videoPaths}; do + ln -sf $vid ${escapeShellArg cfg.dataDir}/www/videos + done + chmod 750 ${escapeShellArg cfg.dataDir} chown -R meguca:meguca ${escapeShellArg cfg.dataDir} diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 67faddb1ddb9..d0278271409a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -14,6 +14,9 @@ let in { + + meta.maintainers = pkgs.pantheon.maintainers; + options = { services.xserver.desktopManager.pantheon = { diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index a74bfce097de..7777913ce1e6 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -25,7 +25,7 @@ in { name = "dwm"; start = '' - ${pkgs.dwm}/bin/dwm & + dwm & waitPID=$! ''; }; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 7c9909ae2787..d10c4feecb43 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -36,8 +36,9 @@ let #! ${pkgs.runtimeShell} -e # Initialise the container side of the veth pair. - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_BRIDGE" ]; then - + if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || + [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] || + [ -n "$HOST_BRIDGE" ]; then ip link set host0 name eth0 ip link set dev eth0 up @@ -88,7 +89,8 @@ let extraFlags+=" --private-network" fi - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then extraFlags+=" --network-veth" fi @@ -159,7 +161,8 @@ let # Clean up existing machined registration and interfaces. machinectl terminate "$INSTANCE" 2> /dev/null || true - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then ip link del dev "ve-$INSTANCE" 2> /dev/null || true ip link del dev "vb-$INSTANCE" 2> /dev/null || true fi @@ -208,7 +211,8 @@ let ''; in '' - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then if [ -z "$HOST_BRIDGE" ]; then ifaceHost=ve-$INSTANCE ip link set dev $ifaceHost up diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix new file mode 100644 index 000000000000..c4e47bfa477c --- /dev/null +++ b/nixos/modules/virtualisation/docker-containers.nix @@ -0,0 +1,233 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.docker-containers; + + dockerContainer = + { name, config, ... }: { + + options = { + + image = mkOption { + type = types.str; + description = "Docker image to run."; + example = "library/hello-world"; + }; + + cmd = mkOption { + type = with types; listOf str; + default = []; + description = "Commandline arguments to pass to the image's entrypoint."; + example = literalExample '' + ["--port=9000"] + ''; + }; + + entrypoint = mkOption { + type = with types; nullOr str; + description = "Overwrite the default entrypoint of the image."; + default = null; + example = "/bin/my-app"; + }; + + environment = mkOption { + type = with types; attrsOf str; + default = {}; + description = "Environment variables to set for this container."; + example = literalExample '' + { + DATABASE_HOST = "db.example.com"; + DATABASE_PORT = "3306"; + } + ''; + }; + + log-driver = mkOption { + type = types.str; + default = "none"; + description = '' + Logging driver for the container. The default of + "none" means that the container's logs will be + handled as part of the systemd unit. Setting this to + "journald" will result in duplicate logging, but + the container's logs will be visible to the docker + logs command. + + For more details and a full list of logging drivers, refer to the + + Docker engine documentation + ''; + }; + + ports = mkOption { + type = with types; listOf str; + default = []; + description = '' + Network ports to publish from the container to the outer host. + + + Valid formats: + + + + + <ip>:<hostPort>:<containerPort> + + + + + <ip>::<containerPort> + + + + + <hostPort>:<containerPort> + + + + + <containerPort> + + + + + Both hostPort and + containerPort can be specified as a range of + ports. When specifying ranges for both, the number of container + ports in the range must match the number of host ports in the + range. Example: 1234-1236:1234-1236/tcp + + + When specifying a range for hostPort only, the + containerPort must not be a + range. In this case, the container port is published somewhere + within the specified hostPort range. Example: + 1234-1236:1234/tcp + + + Refer to the + + Docker engine documentation for full details. + ''; + example = literalExample '' + [ + "8080:9000" + ] + ''; + }; + + user = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Override the username or UID (and optionally groupname or GID) used + in the container. + ''; + example = "nobody:nogroup"; + }; + + volumes = mkOption { + type = with types; listOf str; + default = []; + description = '' + List of volumes to attach to this container. + + Note that this is a list of "src:dst" strings to + allow for src to refer to + /nix/store paths, which would difficult with an + attribute set. There are also a variety of mount options available + as a third field; please refer to the + + docker engine documentation for details. + ''; + example = literalExample '' + [ + "volume_name:/path/inside/container" + "/path/on/host:/path/inside/container" + ] + ''; + }; + + workdir = mkOption { + type = with types; nullOr str; + default = null; + description = "Override the default working directory for the container."; + example = "/var/lib/hello_world"; + }; + + extraDockerOptions = mkOption { + type = with types; listOf str; + default = []; + description = "Extra options for docker run."; + example = literalExample '' + ["--network=host"] + ''; + }; + }; + }; + + mkService = name: container: { + wantedBy = [ "multi-user.target" ]; + after = [ "docker.service" "docker.socket" ]; + requires = [ "docker.service" "docker.socket" ]; + serviceConfig = { + ExecStart = concatStringsSep " \\\n " ([ + "${pkgs.docker}/bin/docker run" + "--rm" + "--name=%n" + "--log-driver=${container.log-driver}" + ] ++ optional (! isNull container.entrypoint) + "--entrypoint=${escapeShellArg container.entrypoint}" + ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) + ++ map (p: "-p ${escapeShellArg p}") container.ports + ++ optional (! isNull container.user) "-u ${escapeShellArg container.user}" + ++ map (v: "-v ${escapeShellArg v}") container.volumes + ++ optional (! isNull container.workdir) "-w ${escapeShellArg container.workdir}" + ++ map escapeShellArg container.extraDockerOptions + ++ [container.image] + ++ map escapeShellArg container.cmd + ); + ExecStartPre = "-${pkgs.docker}/bin/docker rm -f %n"; + ExecStop = "${pkgs.docker}/bin/docker stop %n"; + ExecStopPost = "-${pkgs.docker}/bin/docker rm -f %n"; + + ### There is no generalized way of supporting `reload` for docker + ### containers. Some containers may respond well to SIGHUP sent to their + ### init process, but it is not guaranteed; some apps have other reload + ### mechanisms, some don't have a reload signal at all, and some docker + ### images just have broken signal handling. The best compromise in this + ### case is probably to leave ExecReload undefined, so `systemctl reload` + ### will at least result in an error instead of potentially undefined + ### behaviour. + ### + ### Advanced users can still override this part of the unit to implement + ### a custom reload handler, since the result of all this is a normal + ### systemd service from the perspective of the NixOS module system. + ### + # ExecReload = ...; + ### + + TimeoutStartSec = 0; + TimeoutStopSec = 120; + Restart = "always"; + }; + }; + +in { + + options.docker-containers = mkOption { + default = {}; + type = types.attrsOf (types.submodule dockerContainer); + description = "Docker containers to run as systemd services."; + }; + + config = mkIf (cfg != {}) { + + systemd.services = mapAttrs' (n: v: nameValuePair "docker-${n}" (mkService n v)) cfg; + + virtualisation.docker.enable = true; + + }; + +} diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 037c0d2f0d82..903411799d3e 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -94,6 +94,7 @@ in { fileSystems."/" = { device = "/dev/disk/by-label/nixos"; autoResize = true; + fsType = "ext4"; }; boot.growPartition = true; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6c313f8dd3e4..b9a9515f94ef 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -64,6 +64,7 @@ in rec { #(all nixos.tests.containers) (all nixos.tests.containers-imperative) (all nixos.tests.containers-ipv4) + (all nixos.tests.containers-ipv6) nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 4bfb9a423f7d..b5b09dc38d06 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -33,6 +33,7 @@ in rec { inherit (nixos'.tests) containers-imperative containers-ipv4 + containers-ipv6 firewall ipv6 login diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 69510c1420fa..a5acf78a8839 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -59,6 +59,7 @@ in dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; + docker-containers = handleTestOn ["x86_64-linux"] ./docker-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {}; docker-registry = handleTest ./docker-registry.nix {}; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 210ad8e91df7..f5c8c4863b6f 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -5,116 +5,109 @@ with import ../lib/testing.nix { inherit system pkgs; }; -let - # Test ensures buildbot master comes up correctly and workers can connect - mkBuildbotTest = python: makeTest { - name = "buildbot"; +# Test ensures buildbot master comes up correctly and workers can connect +makeTest { + name = "buildbot"; - nodes = { - bbmaster = { pkgs, ... }: { - services.buildbot-master = { - enable = true; - package = python.pkgs.buildbot-full; + nodes = { + bbmaster = { pkgs, ... }: { + services.buildbot-master = { + enable = true; - # NOTE: use fake repo due to no internet in hydra ci - factorySteps = [ - "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')" - "steps.ShellCommand(command=['bash', 'fakerepo.sh'])" - ]; - changeSource = [ - "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" - ]; - }; - networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ]; - environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ]; - }; - - bbworker = { pkgs, ... }: { - services.buildbot-worker = { - enable = true; - masterUrl = "bbmaster:9989"; - }; - environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ]; - }; - - gitrepo = { pkgs, ... }: { - services.openssh.enable = true; - networking.firewall.allowedTCPPorts = [ 22 9418 ]; - environment.systemPackages = with pkgs; [ git ]; + # NOTE: use fake repo due to no internet in hydra ci + factorySteps = [ + "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')" + "steps.ShellCommand(command=['bash', 'fakerepo.sh'])" + ]; + changeSource = [ + "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" + ]; }; + networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ]; + environment.systemPackages = with pkgs; [ git python3Packages.buildbot-full ]; }; - testScript = '' - #Start up and populate fake repo - $gitrepo->waitForUnit("multi-user.target"); - print($gitrepo->execute(" \ - git config --global user.name 'Nobody Fakeuser' && \ - git config --global user.email 'nobody\@fakerepo.com' && \ - rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \ - mkdir -pv /srv/repos/fakerepo ~/.ssh && \ - ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \ - cat ~/.ssh/known_hosts && \ - cd /srv/repos/fakerepo && \ - git init && \ - echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \ - cat fakerepo.sh && \ - touch .git/git-daemon-export-ok && \ - git add fakerepo.sh .git/git-daemon-export-ok && \ - git commit -m fakerepo && \ - git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \ - ")); - - # Test gitrepo - $bbmaster->waitForUnit("network-online.target"); - #$bbmaster->execute("nc -z gitrepo 9418"); - print($bbmaster->execute(" \ - rm -rfv /tmp/fakerepo && \ - git clone git://gitrepo/fakerepo /tmp/fakerepo && \ - pwd && \ - ls -la && \ - ls -la /tmp/fakerepo \ - ")); - - # Test start master and connect worker - $bbmaster->waitForUnit("buildbot-master.service"); - $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/; - $bbworker->waitForUnit("network-online.target"); - $bbworker->execute("nc -z bbmaster 8010"); - $bbworker->execute("nc -z bbmaster 9989"); - $bbworker->waitForUnit("buildbot-worker.service"); - print($bbworker->execute("ls -la /home/bbworker/worker")); - - - # Test stop buildbot master and worker - print($bbmaster->execute(" \ - systemctl -l --no-pager status buildbot-master && \ - systemctl stop buildbot-master \ - ")); - $bbworker->fail("nc -z bbmaster 8010"); - $bbworker->fail("nc -z bbmaster 9989"); - print($bbworker->execute(" \ - systemctl -l --no-pager status buildbot-worker && \ - systemctl stop buildbot-worker && \ - ls -la /home/bbworker/worker \ - ")); - - - # Test buildbot daemon mode - $bbmaster->execute("buildbot create-master /tmp"); - $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg"); - $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg"); - $bbmaster->execute("buildbot start /tmp"); - $bbworker->execute("nc -z bbmaster 8011"); - $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/; - $bbmaster->execute("buildbot stop /tmp"); - $bbworker->fail("nc -z bbmaster 8011"); - - ''; - - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; + bbworker = { pkgs, ... }: { + services.buildbot-worker = { + enable = true; + masterUrl = "bbmaster:9989"; + }; + environment.systemPackages = with pkgs; [ git python3Packages.buildbot-worker ]; + }; + gitrepo = { pkgs, ... }: { + services.openssh.enable = true; + networking.firewall.allowedTCPPorts = [ 22 9418 ]; + environment.systemPackages = with pkgs; [ git ]; + }; }; -in { - python2 = mkBuildbotTest pkgs.python2; - python3 = mkBuildbotTest pkgs.python3; + + testScript = '' + #Start up and populate fake repo + $gitrepo->waitForUnit("multi-user.target"); + print($gitrepo->execute(" \ + git config --global user.name 'Nobody Fakeuser' && \ + git config --global user.email 'nobody\@fakerepo.com' && \ + rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \ + mkdir -pv /srv/repos/fakerepo ~/.ssh && \ + ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \ + cat ~/.ssh/known_hosts && \ + cd /srv/repos/fakerepo && \ + git init && \ + echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \ + cat fakerepo.sh && \ + touch .git/git-daemon-export-ok && \ + git add fakerepo.sh .git/git-daemon-export-ok && \ + git commit -m fakerepo && \ + git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \ + ")); + + # Test gitrepo + $bbmaster->waitForUnit("network-online.target"); + #$bbmaster->execute("nc -z gitrepo 9418"); + print($bbmaster->execute(" \ + rm -rfv /tmp/fakerepo && \ + git clone git://gitrepo/fakerepo /tmp/fakerepo && \ + pwd && \ + ls -la && \ + ls -la /tmp/fakerepo \ + ")); + + # Test start master and connect worker + $bbmaster->waitForUnit("buildbot-master.service"); + $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/; + $bbworker->waitForUnit("network-online.target"); + $bbworker->execute("nc -z bbmaster 8010"); + $bbworker->execute("nc -z bbmaster 9989"); + $bbworker->waitForUnit("buildbot-worker.service"); + print($bbworker->execute("ls -la /home/bbworker/worker")); + + + # Test stop buildbot master and worker + print($bbmaster->execute(" \ + systemctl -l --no-pager status buildbot-master && \ + systemctl stop buildbot-master \ + ")); + $bbworker->fail("nc -z bbmaster 8010"); + $bbworker->fail("nc -z bbmaster 9989"); + print($bbworker->execute(" \ + systemctl -l --no-pager status buildbot-worker && \ + systemctl stop buildbot-worker && \ + ls -la /home/bbworker/worker \ + ")); + + + # Test buildbot daemon mode + $bbmaster->execute("buildbot create-master /tmp"); + $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg"); + $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg"); + $bbmaster->execute("buildbot start /tmp"); + $bbworker->execute("nc -z bbmaster 8011"); + $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/; + $bbmaster->execute("buildbot stop /tmp"); + $bbworker->fail("nc -z bbmaster 8011"); + + ''; + + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ]; } diff --git a/nixos/tests/docker-containers.nix b/nixos/tests/docker-containers.nix new file mode 100644 index 000000000000..972552735202 --- /dev/null +++ b/nixos/tests/docker-containers.nix @@ -0,0 +1,29 @@ +# Test Docker containers as systemd units + +import ./make-test.nix ({ pkgs, lib, ... }: { + name = "docker-containers"; + meta = { + maintainers = with lib.maintainers; [ benley ]; + }; + + nodes = { + docker = { pkgs, ... }: + { + virtualisation.docker.enable = true; + + virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nginx ]; + + docker-containers.nginx = { + image = "nginx-container"; + ports = ["8181:80"]; + }; + }; + }; + + testScript = '' + startAll; + $docker->waitForUnit("docker-nginx.service"); + $docker->waitForOpenPort(8181); + $docker->waitUntilSucceeds("curl http://localhost:8181|grep Hello"); + ''; +}) diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 8def0a6f9b9a..6b53914fd859 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -33,11 +33,13 @@ in { longitude = "0.0"; elevation = 0; auth_providers = [ - { type = "legacy_api_password"; } + { + type = "legacy_api_password"; + api_password = apiPassword; + } ]; }; frontend = { }; - http.api_password = apiPassword; mqtt = { # Use hbmqtt as broker password = mqttPassword; }; diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 8306abb8c42f..85047f66f23c 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -20,8 +20,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { testScript = '' print $machine->succeed("ip link"); - $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}"); - $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}"); + $machine->${if predictable then "fail" else "succeed"}("ip link show eth0 "); ''; }; }) [[true false] [true false]]) diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index 331ef6b92a4f..fdfc350961c7 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-gui-${version}"; - version = "0.13.0.4"; + version = "0.14.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "142yj5s15bhm300dislq3x5inw1f37shnrd5vyj78jjcvry3wymw"; + sha256 = "1l4kx2vidr7bpds43jdbwyaz0q1dy7sricpz061ff1fkappbxdh8"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/altcoins/monero-gui/move-log-file.patch b/pkgs/applications/altcoins/monero-gui/move-log-file.patch index 74f817d81350..ae733151622d 100644 --- a/pkgs/applications/altcoins/monero-gui/move-log-file.patch +++ b/pkgs/applications/altcoins/monero-gui/move-log-file.patch @@ -13,15 +13,17 @@ index 79223c0..e80b317 100644 parser.addHelpOption(); parser.process(app); diff --git a/Logger.cpp b/Logger.cpp -index 660bafc..dae24d4 100644 +index 6b1daba..c357762 100644 --- a/Logger.cpp +++ b/Logger.cpp -@@ -15,7 +15,7 @@ static const QString default_name = "monero-wallet-gui.log"; - #elif defined(Q_OS_MAC) - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0) + "/Library/Logs"; +@@ -28,8 +28,8 @@ static const QString defaultLogName = "monero-wallet-gui.log"; + static const QString appFolder = "Library/Logs"; #else // linux + bsd + //HomeLocation = "~" - static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).at(0); +- static const QString appFolder = ".bitmonero"; + static const QString osPath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).at(0); ++ static const QString appFolder = "bitmonero"; #endif - + diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 3a962458632e..94c277f63eb0 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.13.0.4"; + version = "0.14.0.2"; src = fetchgit { url = "https://github.com/monero-project/monero.git"; rev = "v${version}"; - sha256 = "1ambgakapijhsi1pd70vw8vvnlwa3nid944lqkbfq3wl25lmc70d"; + sha256 = "1471iy6c8dfdqcmcwcp0m7fp9xl74dcm5hqlfdfi217abhawfs8k"; }; nativeBuildInputs = [ cmake pkgconfig git ]; diff --git a/pkgs/applications/audio/csound/csound-manual/default.nix b/pkgs/applications/audio/csound/csound-manual/default.nix index f82ec7a4ea13..df0fcb0ee9cd 100644 --- a/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/pkgs/applications/audio/csound/csound-manual/default.nix @@ -1,18 +1,19 @@ -{ - stdenv, fetchurl, docbook_xsl, - docbook_xml_dtd_45, python, pygments, - libxslt +{ + stdenv, fetchFromGitHub, docbook_xsl, + docbook_xml_dtd_45, python, pygments, + libxslt }: stdenv.mkDerivation rec { - version = "6.12.0"; - name = "csound-manual-${version}"; - - src = fetchurl { - url = "https://github.com/csound/manual/archive/${version}.tar.gz"; - sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp"; - }; + pname = "csound-manual"; + version = "unstable-2019-02-22"; + src = fetchFromGitHub { + owner = "csound"; + repo = "manual"; + rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f"; + sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn"; + }; prePatch = '' substituteInPlace manual.xml \ @@ -41,4 +42,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; }; } - diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 9687ff3106bd..b3efa82ead47 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "muse-sequencer-${version}"; - version = "3.0.2"; + version = "3.1pre1"; meta = with stdenv.lib; { homepage = http://www.muse-sequencer.org; @@ -38,11 +38,16 @@ stdenv.mkDerivation rec { fetchFromGitHub { owner = "muse-sequencer"; repo = "muse"; - rev = "02d9dc6abd757c3c1783fdd46dacd3c4ef2c0a6d"; - sha256 = "0pn0mcg79z3bhjwxbss3ylypdz3gg70q5d1ij3x8yw65ryxbqf51"; + rev = "2167ae053c16a633d8377acdb1debaac10932838"; + sha256 = "0rsdx8lvcbz5bapnjvypw8h8bq587s9z8cf2znqrk6ah38s6fsrf"; }; + nativeBuildInputs = [ + pkgconfig + gitAndTools.gitFull + ]; + buildInputs = [ libjack2 qt5.qtsvg @@ -57,8 +62,6 @@ stdenv.mkDerivation rec { lash dssi liblo - pkgconfig - gitAndTools.gitFull ]; sourceRoot = "source/muse3"; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 8ec4a342522d..9407a1c26882 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "3.0.1"; + version = "3.0.5"; src = fetchzip { url = "https://download.musescore.com/releases/MuseScore-${version}/MuseScore-${version}.zip"; - sha256 = "1l9djxq5hdfqiya2jwcag7qq4dhmb9qcv68y27dlza19imrnim80"; + sha256 = "1pbf6v0l3nixxr8k5igwhj09wnqvw92av6q6yjrbb3kyjh5br2d8"; stripRoot = false; }; diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 3310bfdf3f03..87257f4920df 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, meson, gnome3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, meson, gtk3, at-spi2-core, dbus, gst_all_1, sphinxbase, pocketsphinx, ninja, gettext, appstream-glib, python3, glib, gobject-introspection, gsettings-desktop-schemas, itstool, wrapGAppsHook, makeWrapper, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "parlatype"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk + gtk3 at-spi2-core dbus gst_all_1.gstreamer diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix new file mode 100644 index 000000000000..b2c049c9eeeb --- /dev/null +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -0,0 +1,50 @@ +{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat, +minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }: + +stdenv.mkDerivation { + pname = "paulstretch"; + version = "2.2-2"; + + src = fetchFromGitHub { + owner = "paulnasca"; + repo = "paulstretch_cpp"; + rev = "7f5c3993abe420661ea0b808304b0e2b4b0048c5"; + sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + audiofile + libvorbis + fltk + fftw + fftwFloat + minixml + libmad + libjack2 + portaudio + libsamplerate + ]; + + buildPhase = '' + bash compile_linux_fftw_jack.sh + ''; + + installPhase = '' + install -Dm555 ./paulstretch $out/bin/paulstretch + ''; + + meta = with stdenv.lib; { + description = "Produces high quality extreme sound stretching"; + longDescription = '' + This is a program for stretching the audio. It is suitable only for + extreme sound stretching of the audio (like 50x) and for applying + special effects by "spectral smoothing" the sounds. + It can transform any sound/music to a texture. + ''; + homepage = http://hypermammut.sourceforge.net/paulstretch/; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index c10358eed1e4..eab498b96249 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.2.5"; + name = "qmmp-1.3.1"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1xs8kg65088yzdhdkymmknkp1s4adzv095f5jhjvy62s8ymyjvnx"; + sha256 = "1dmybzibpr6hpr2iv1wvrjgww842mng2x0rh1mr8gs8j191xvlhw"; }; buildInputs = diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index cabebb6f18e9..8e2b096672c1 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, autoPatchelfHook, makeWrapper , alsaLib, xorg -, gnome3, pango, gdk_pixbuf, cairo, glib, freetype +, gnome3, gtk3, pango, gdk_pixbuf, cairo, glib, freetype , libpulseaudio, xdg_utils }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - gnome3.gtk + gtk3 ]; dontBuild = true; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index eab50c904795..2162ddd79815 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -4,6 +4,7 @@ , perlPackages , gtk3 , intltool +, libpeas , libsoup , gnome3 , totem-pl-parser @@ -48,7 +49,7 @@ in stdenv.mkDerivation rec { json-glib gtk3 - gnome3.libpeas + libpeas totem-pl-parser gnome3.adwaita-icon-theme diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 7876ebc244b1..4f8e520cb9f2 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext , gnome3, libnotify, itstool, glib, gtk3, libxml2 -, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook +, coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , appstream-glib, desktop-file-utils, duplicity }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libnotify gnome3.libpeas glib gtk3 libsecret + libnotify libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f3e5602a7996..7cd436288e67 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0d7d6n7n1zzhxpdykbwwbrw139mqxkp20d4l0570pk7975p1s2q9"; }; latestVersion = { # canary & dev - version = "3.5.0.6"; # "Android Studio 3.5 Canary 7" - build = "183.5346365"; - sha256Hash = "0dfkhzsxabrv8cwgyv3gicpglgpccmi1ig5shlhp6a006awgfyj0"; + version = "3.5.0.7"; # "Android Studio 3.5 Canary 8" + build = "191.5375575"; + sha256Hash = "0vssynvj0j4xbin9h95lciilc3j9mkm53vwzxxr3kqxwl74qx4mj"; }; in rec { # Old alias (TODO @primeos: Remove after 19.03 is branched off): diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 99b014adb023..38606bc4c296 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -17,6 +17,7 @@ , json-glib , jsonrpc-glib , libdazzle +, libpeas , libxml2 , meson , ninja @@ -64,7 +65,7 @@ in stdenv.mkDerivation { flatpak gnome3.devhelp libgit2-glib - gnome3.libpeas + libpeas vte gspell gtk3 diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 08918beb8d59..9547b82efa1f 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, gnome3, at-spi2-core, +{ stdenv, fetchgit, gnome3, gtksourceview3, at-spi2-core, gtksourceviewmm, boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre, - libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, + libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { dbus openssl libxml2 - gnome3.gtksourceview + gtksourceview3 at-spi2-core pcre epoxy @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { aspell libgit2 libxkbcommon - gnome3.gtkmm3 + gtkmm3 libpthreadstubs - gnome3.gtksourceviewmm + gtksourceviewmm llvmPackages.clang.cc llvmPackages.lldb gnome3.dconf diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index ea0514066e98..085affa5f7ec 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,14 +2,14 @@ let pname = "kdev-php"; - version = "5.3.1"; + version = "5.3.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; + sha256 = "0yjn7y7al2xs8g0mrjvcym8gbjy4wmiv7lsljcrasjd7ymag1wgs"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 1c311539dd7c..4fbf3ed297c1 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,14 +2,14 @@ let pname = "kdev-python"; - version = "5.3.1"; + version = "5.3.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; + sha256 = "0gqv1abzfpxkrf538rb62d2291lmlra8rghm9q9r3x8a46wh96zm"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 98154b4a5eb5..23ec887ad621 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -9,7 +9,7 @@ let pname = "kdevelop"; - version = "5.3.1"; + version = "5.3.2"; qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1098ra7qpal6578hsv20kvxc63v47sp85wjhqr5rgzr2fm7jf6fr"; + sha256 = "0akgdnvrab6mbwnmvgzsplk0qh83k1hnm5xc06yxr1s1a5sxbk08"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix new file mode 100644 index 000000000000..3288b8e90adc --- /dev/null +++ b/pkgs/applications/editors/retext/default.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, buildEnv, aspellDicts +# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries +# available. +, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ] +}: + +let + version = "7.0.4"; + python = let + packageOverrides = self: super: { + markdown = super.markdown.overridePythonAttrs(old: rec { + src = super.fetchPypi { + version = "3.0.1"; + pname = "Markdown"; + sha256 = "d02e0f9b04c500cde6637c11ad7c72671f359b87b9fe924b2383649d8841db7c"; + }; + }); + + chardet = super.chardet.overridePythonAttrs(old: rec { + src = super.fetchPypi { + version = "2.3.0"; + pname = "chardet"; + sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; + }; + }); + }; + in python3.override { inherit packageOverrides; }; + pythonEnv = python.withPackages (ps: with ps; [ + pyqt5 docutils pyenchant Markups markdown pygments chardet + ]); +in python.pkgs.buildPythonApplication { + inherit version; + pname = "retext"; + + src = fetchFromGitHub { + owner = "retext-project"; + repo = "retext"; + rev = "${version}"; + sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; + }; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ pythonEnv ]; + + postInstall = '' + mv $out/bin/retext $out/bin/.retext + makeWrapper "$out/bin/.retext" "$out/bin/retext" \ + --set ASPELL_CONF "dict-dir ${buildEnv { + name = "aspell-all-dicts"; + paths = map (path: "${path}/lib/aspell") enchantAspellDicts; + }}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/retext-project/retext/; + description = "Simple but powerful editor for Markdown and reStructuredText"; + license = licenses.gpl3; + maintainers = with maintainers; [ klntsky ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index bc8f2c608693..f322c6442b84 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { name = "drawpile-${version}"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "0fngj5hfinj66xpij2h3ag79mgmqcfrjpwynxdbjr5brch25ldwj"; + sha256 = "0n54p5day6gnmxqmgx4yd7q6y0mgv1nwh84yrz5r953yhd9m37rn"; }; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/graphics/image_optim/Gemfile b/pkgs/applications/graphics/image_optim/Gemfile new file mode 100644 index 000000000000..d6a0f13a4c1a --- /dev/null +++ b/pkgs/applications/graphics/image_optim/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'image_optim' diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/pkgs/applications/graphics/image_optim/Gemfile.lock new file mode 100644 index 000000000000..20c9772ce464 --- /dev/null +++ b/pkgs/applications/graphics/image_optim/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + exifr (1.3.6) + fspath (3.1.0) + image_optim (0.26.3) + exifr (~> 1.2, >= 1.2.2) + fspath (~> 3.0) + image_size (>= 1.5, < 3) + in_threads (~> 1.3) + progress (~> 3.0, >= 3.0.1) + image_size (2.0.0) + in_threads (1.5.1) + progress (3.5.0) + +PLATFORMS + ruby + +DEPENDENCIES + image_optim + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix new file mode 100644 index 000000000000..d7f05381c62e --- /dev/null +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -0,0 +1,66 @@ +{ lib, bundlerApp, fetchurl, ruby, makeWrapper, + withPngcrush ? true, pngcrush ? null, + withPngout ? true, pngout ? null, + withAdvpng ? true, advancecomp ? null, + withOptipng ? true, optipng ? null, + withPngquant ? true, pngquant ? null, + withJhead ? true, jhead ? null, + withJpegoptim ? true, jpegoptim ? null, + withJpegrecompress ? true, jpeg-archive ? null, + withJpegtran ? true, libjpeg ? null, + withGifsicle ? true, gifsicle ? null, + withSvgo ? true, svgo ? null +}: + +assert withPngcrush -> pngcrush != null; +assert withPngout -> pngout != null; +assert withAdvpng -> advancecomp != null; +assert withOptipng -> optipng != null; +assert withPngquant -> pngquant != null; +assert withJhead -> jhead != null; +assert withJpegoptim -> jpegoptim != null; +assert withJpegrecompress -> jpeg-archive != null; +assert withJpegtran -> libjpeg != null; +assert withGifsicle -> gifsicle != null; +assert withSvgo -> svgo != null; + +with lib; + +let + optionalDepsPath = [] + ++ optional withPngcrush pngcrush + ++ optional withPngout pngout + ++ optional withAdvpng advancecomp + ++ optional withOptipng optipng + ++ optional withPngquant pngquant + ++ optional withJhead jhead + ++ optional withJpegoptim jpegoptim + ++ optional withJpegrecompress jpeg-archive + ++ optional withJpegtran libjpeg + ++ optional withGifsicle gifsicle + ++ optional withSvgo svgo; +in + +bundlerApp { + pname = "image_optim"; + gemdir = ./.; + + inherit ruby; + + exes = [ "image_optim" ]; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/image_optim \ + --prefix PATH : ${makeBinPath optionalDepsPath} + ''; + + meta = with lib; { + description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)"; + homepage = http://github.com/toy/image_optim; + license = licenses.mit; + maintainers = with maintainers; [ srghma ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/image_optim/gemset.nix b/pkgs/applications/graphics/image_optim/gemset.nix new file mode 100644 index 000000000000..6c9ec2de7457 --- /dev/null +++ b/pkgs/applications/graphics/image_optim/gemset.nix @@ -0,0 +1,51 @@ +{ + exifr = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q2abhiyvgfv23i0izbskjxcqaxiw9bfg6s57qgn4li4yxqpwpfg"; + type = "gem"; + }; + version = "1.3.6"; + }; + fspath = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vjn9sy4hklr2d5wxmj5x1ry31dfq3sjp779wyprb3nbbdmra1sc"; + type = "gem"; + }; + version = "3.1.0"; + }; + image_optim = { + dependencies = ["exifr" "fspath" "image_size" "in_threads" "progress"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "082w9qcyy9j6m6s2pknfdcik7l2qch4j48axs13m06l4s1hz0dmg"; + type = "gem"; + }; + version = "0.26.3"; + }; + image_size = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bcn7nc6qix3w4sf7xd557lnsgjniqa7qvz7nnznx70m8qfbc7ig"; + type = "gem"; + }; + version = "2.0.0"; + }; + in_threads = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14hqm59sgqi91ag187zwpgwi58xckjkk58m031ghkp0csl8l9mkx"; + type = "gem"; + }; + version = "1.5.1"; + }; + progress = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yrzq4v5sp7cg4nbgqh11k3d1czcllfz98dcdrxrsjxwq5ziiw0p"; + type = "gem"; + }; + version = "3.5.0"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/graphics/image_optim/update.sh b/pkgs/applications/graphics/image_optim/update.sh new file mode 100755 index 000000000000..8afd7f90436d --- /dev/null +++ b/pkgs/applications/graphics/image_optim/update.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bundix bundler + +SCRIPT_DIR=$(dirname "$(readlink -f "$BASH_SOURCE")") + +cd $SCRIPT_DIR + +bundle lock --update +bundix diff --git a/pkgs/applications/graphics/jpeg-archive/default.nix b/pkgs/applications/graphics/jpeg-archive/default.nix new file mode 100644 index 000000000000..8002da557035 --- /dev/null +++ b/pkgs/applications/graphics/jpeg-archive/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, mozjpeg, makeWrapper, coreutils, parallel, findutils }: + +stdenv.mkDerivation rec { + name = "jpeg-archive-${version}"; + version = "2.2.0"; # can be found here https://github.com/danielgtaylor/jpeg-archive/blob/master/src/util.c#L15 + + # update with + # nix-prefetch-git https://github.com/danielgtaylor/jpeg-archive + src = fetchFromGitHub { + owner = "danielgtaylor"; + repo = "jpeg-archive"; + rev = "8da4bf76b6c3c0e11e4941294bfc1857c119419b"; + sha256 = "1639y9qp2ls80fzimwmwds792q8rq5p6c14c0r4jswx4yp6dcs33"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mozjpeg ]; + + prePatch = '' + # allow override LIBJPEG + substituteInPlace Makefile --replace 'LIBJPEG =' 'LIBJPEG ?=' + ''; + + makeFlags = [ + "PREFIX=$(out)" + "MOZJPEG_PREFIX=${mozjpeg}" + "LIBJPEG=${mozjpeg}/lib/libjpeg.so" + ]; + + postInstall = '' + wrapProgram $out/bin/jpeg-archive \ + --set PATH "$out/bin:${coreutils}/bin:${parallel}/bin:${findutils}/bin" + ''; + + meta = with stdenv.lib; { + description = "Utilities for archiving photos for saving to long term storage or serving over the web"; + homepage = "https://github.com/danielgtaylor/jpeg-archive"; + # license = ...; # mixed? + maintainers = [ maintainers.srghma ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index c9fdbd255d46..507cee548e09 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -5,27 +5,27 @@ , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras -, python3 +, python3Packages }: let major = "4.1"; -minor = "7"; -patch = "101"; +minor = "8"; +patch = null; in mkDerivation rec { name = "krita-${version}"; - version = "${major}.${minor}.${patch}"; + version = "${major}.${minor}"; src = fetchurl { url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz"; - sha256 = "0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav"; + sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4"; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons @@ -33,11 +33,17 @@ mkDerivation rec { boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras - python3 + python3Packages.pyqt5 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; + cmakeFlags = [ + "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/share/sip/PyQt5" + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + ]; + meta = with lib; { description = "A free and open source painting application"; homepage = https://krita.org/; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 75783805fa3b..e0fd33d5e612 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -7,7 +7,7 @@ # Gtk deps # upstream gImagereader supports Qt too , gtk3, gobject-introspection, wrapGAppsHook -, gnome3, gtkspell3, gtkspellmm, cairomm +, gnome3, gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm }: let @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { poppler # Gtk specific - gnome3.gtkmm + gtkmm3 gtkspell3 gtkspellmm - gnome3.gtksourceview - gnome3.gtksourceviewmm + gtksourceview3 + gtksourceviewmm cairomm json-glib ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 8401386ead49..a9e6d905c284 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: +{ stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gxmessage-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; + buildInputs = [ intltool gtk3 texinfo hicolor-icon-theme ]; meta = { description = "A GTK enabled dropin replacement for xmessage"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2928d271efcf..928a1bae108a 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }: let - version = "5.2.20"; + version = "5.3.22"; in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m"; + sha256 = "0cnw01g3j5l07f2lng604mx8qqm61i5sflryj1vya2gkjmrphkan"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index e03dd65b9eb3..15cd426f1b3f 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,26 +1,21 @@ { stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: stdenv.mkDerivation rec { - name = "qtpass-${version}"; - version = "1.2.1"; + pname = "qtpass"; + version = "1.2.3"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0pp38b3fifkfwqcb6vi194ccgb8j3zc8j8jq8ww5ib0wvhldzsg8"; + sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky"; }; - patches = [ ./hidpi.patch ]; - buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ makeWrapper qmake ]; - postPatch = '' - substituteInPlace qtpass.pro --replace "SUBDIRS += src tests main" "SUBDIRS += src main" - substituteInPlace qtpass.pro --replace "main.depends = tests" "main.depends = src" - ''; + enableParallelBuilding = true; postInstall = '' install -D qtpass.desktop $out/share/applications/qtpass.desktop diff --git a/pkgs/applications/misc/qtpass/hidpi.patch b/pkgs/applications/misc/qtpass/hidpi.patch deleted file mode 100644 index 629bcbb5baca..000000000000 --- a/pkgs/applications/misc/qtpass/hidpi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/main/main.cpp b/main/main.cpp -index 8a18409c..1cddd911 100644 ---- a/main/main.cpp -+++ b/main/main.cpp -@@ -35,7 +35,7 @@ - * @return - */ - int main(int argc, char *argv[]) { -- qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); -+ QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - QString text = ""; - for (int i = 1; i < argc; ++i) { - if (i > 1) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 127d9f21d998..6079c8807dc1 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.20.0"; + version = "0.21.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "0s5i6fjip5kvvyb59yndi2rhgn962lr0g9b0pi5w2aqnv1mwjbfh"; + sha256 = "03s81i9rz7dn33r13p7j2c7yw874hkm64x7myddiqw9lc21fyzql"; }; checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; - [ requests beautifulsoup4 future ]; + [ requests beautifulsoup4 future wcwidth ]; checkPhase = '' py.test diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index dcc77604e6ea..ab1e0b5dda26 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -3,17 +3,18 @@ , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio , nlSupport ? true, libnl +, udevSupport ? true, udev , swaySupport ? true, sway }: stdenv.mkDerivation rec { name = "waybar-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "0vkx1b6bgr75wkx89ppxhg4103vl2g0sky22npmfkvbkpgh8dj38"; + sha256 = "006pzx4crsqn9vk28g87306xh3jrfwk4ib9cmsxqrxy8v0kl2s4g"; }; nativeBuildInputs = [ @@ -25,19 +26,21 @@ ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl + ++ optional udevSupport udev ++ optional swaySupport sway; mesonFlags = [ "-Ddbusmenu-gtk=${ if traySupport then "enabled" else "disabled" }" "-Dpulseaudio=${ if pulseSupport then "enabled" else "disabled" }" "-Dlibnl=${ if nlSupport then "enabled" else "disabled" }" + "-Dlibudev=${ if udevSupport then "enabled" else "disabled" }" "-Dout=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Highly customizable Wayland bar for Sway and Wlroots based compositors"; license = licenses.mit; - maintainers = [ maintainers.FlorianFranzen ]; + maintainers = with maintainers; [ FlorianFranzen minijackson ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index d4afe4ea9e14..6fc7de1d4d57 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { - name = "zola-${version}"; - version = "0.5.1"; + pname = "zola"; + version = "0.6.0"; src = fetchFromGitHub { owner = "getzola"; - repo = "zola"; + repo = pname; rev = "v${version}"; - sha256 = "1jj6yfb3qkfq3nwcxfrc7k1gqyls873imxgpifbwjx9slg6ssis9"; + sha256 = "11y5gb6lx040ax4b16fr3whkj4vmv8hlkvb50h58gs77payglf6l"; }; - cargoSha256 = "1hn2l25fariidgdr32mfx2yqb3g8xk4qafs614bdjiyvfrb7j752"; + cargoSha256 = "19hqkj27dbsy4pi0i8mjjlhi4351yifvc6zln6scc2nd60p251h6"; - nativeBuildInputs = [ cmake pkgconfig openssl ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' install -D -m 444 completions/zola.bash \ diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix new file mode 100644 index 000000000000..7c6f2d8a570f --- /dev/null +++ b/pkgs/applications/networking/brig/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgx }: + +buildGoPackage rec { + name = "brig-${version}"; + version = "0.3.0"; + rev = "v${version}"; + + goPackagePath = "github.com/sahib/brig"; + subPackages = ["."]; + + src = fetchFromGitHub { + owner = "sahib"; + repo = "brig"; + inherit rev; + sha256 = "01hpb6cvq8cw21ka74jllggkv5pavc0sbl1207x32gzxslw3gsvy"; + }; + + meta = with stdenv.lib; { + description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; + homepage = https://github.com/sahib/brig; + license = licenses.agpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 36576df4b732..04713afe6107 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,10 +20,12 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport +, libva ? null # useVaapi # package customization , enableNaCl ? false , enableWideVine ? false +, useVaapi ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -126,6 +128,7 @@ let ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "72") jdk.jre; @@ -143,6 +146,9 @@ let # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits # # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (useVaapi) [ + # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi + ./patches/chromium-vaapi.patch ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) ] ++ optional stdenv.isAarch64 @@ -260,6 +266,8 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; + } // optionalAttrs useVaapi { + use_vaapi = true; } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 4b9a747811f8..10635383fdee 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,7 @@ { newScope, config, stdenv, llvmPackages, gcc8Stdenv, llvmPackages_7 , makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas +, libva ? null # package customization , channel ? "stable" @@ -10,6 +11,7 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false +, useVaapi ? true , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -32,6 +34,7 @@ in let mkChromiumDerivation = callPackage ./common.nix { inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport + useVaapi enableWideVine; }; @@ -92,6 +95,10 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + libPath = stdenv.lib.makeLibraryPath ([] + ++ stdenv.lib.optional useVaapi libva + ); + in with stdenv.lib; '' mkdir -p "$out/bin" @@ -109,6 +116,8 @@ in stdenv.mkDerivation { export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" fi + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:${libPath}" + # libredirect causes chromium to deadlock on startup export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch new file mode 100644 index 000000000000..38d77e215516 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-vaapi.patch @@ -0,0 +1,117 @@ +From abc7295ca1653c85472916909f0eb76e28e79a58 Mon Sep 17 00:00:00 2001 +From: Akarshan Biswas +Date: Thu, 24 Jan 2019 12:45:29 +0530 +Subject: [PATCH] Enable mojo with VDA2 on Linux + +--- + chrome/browser/about_flags.cc | 8 ++++---- + chrome/browser/flag_descriptions.cc | 9 +++++++-- + chrome/browser/flag_descriptions.h | 10 ++++++++-- + gpu/config/software_rendering_list.json | 3 ++- + media/media_options.gni | 9 ++++++--- + media/mojo/services/gpu_mojo_media_client.cc | 4 ++-- + 6 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc +index 0a84c6ac1..be2aa1d8b 100644 +--- a/chrome/browser/about_flags.cc ++++ b/chrome/browser/about_flags.cc +@@ -1714,7 +1714,7 @@ const FeatureEntry kFeatureEntries[] = { + "disable-accelerated-video-decode", + flag_descriptions::kAcceleratedVideoDecodeName, + flag_descriptions::kAcceleratedVideoDecodeDescription, +- kOsMac | kOsWin | kOsCrOS | kOsAndroid, ++ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), + }, + #if defined(OS_WIN) +@@ -2345,12 +2345,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(service_manager::features::kXRSandbox)}, + #endif // ENABLE_ISOLATED_XR_SERVICE + #endif // ENABLE_VR +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) + {"disable-accelerated-mjpeg-decode", + flag_descriptions::kAcceleratedMjpegDecodeName, +- flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, ++ flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, + SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, +-#endif // OS_CHROMEOS ++#endif // OS_CHROMEOS // OS_LINUX + {"v8-cache-options", flag_descriptions::kV8CacheOptionsName, + flag_descriptions::kV8CacheOptionsDescription, kOsAll, + MULTI_VALUE_TYPE(kV8CacheOptionsChoices)}, +diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc +index 62637e092..86f89fc6e 100644 +--- a/chrome/browser/flag_descriptions.cc ++++ b/chrome/browser/flag_descriptions.cc +@@ -3085,15 +3085,20 @@ const char kTextSuggestionsTouchBarDescription[] = + + #endif + +-// Chrome OS ------------------------------------------------------------------- ++// Chrome OS Linux------------------------------------------------------------------- + +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) + + const char kAcceleratedMjpegDecodeName[] = + "Hardware-accelerated mjpeg decode for captured frame"; + const char kAcceleratedMjpegDecodeDescription[] = + "Enable hardware-accelerated mjpeg decode for captured frame where " + "available."; ++#endif ++ ++// Chrome OS -------------------------------------------------- ++ ++#if defined(OS_CHROMEOS) + + const char kAllowTouchpadThreeFingerClickName[] = "Touchpad three-finger-click"; + const char kAllowTouchpadThreeFingerClickDescription[] = +diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h +index 5dac660bb..6cc4115da 100644 +--- a/chrome/browser/flag_descriptions.h ++++ b/chrome/browser/flag_descriptions.h +@@ -1846,13 +1846,19 @@ extern const char kPermissionPromptPersistenceToggleDescription[]; + + #endif // defined(OS_MACOSX) + +-// Chrome OS ------------------------------------------------------------------ ++// Chrome OS and Linux ------------------------------------------------------------------ + +-#if defined(OS_CHROMEOS) ++#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) + + extern const char kAcceleratedMjpegDecodeName[]; + extern const char kAcceleratedMjpegDecodeDescription[]; + ++#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) ++ ++// Chrome OS ------------------------------------------------------------------------ ++ ++#if defined(OS_CHROMEOS) ++ + extern const char kAllowTouchpadThreeFingerClickName[]; + extern const char kAllowTouchpadThreeFingerClickDescription[]; + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 65f37b3f1..ae8a1718f 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -371,11 +371,12 @@ + }, + { + "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", ++ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms", + "cr_bugs": [137247], + "os": { + "type": "linux" + }, ++ "vendor_id": "0x10de", + "features": [ + "accelerated_video_decode" + ] +-- +2.20.1 + diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index ff16ddb90f69..c721a61591a1 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { name = "falkon-${version}"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41"; + sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; }; preConfigure = '' diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index fab98ad2e2b5..4262609c66ba 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -50,6 +50,7 @@ , gnupg , ffmpeg , runtimeShell +, systemLocale ? config.i18n.defaultLocale or "en-US" }: let @@ -69,8 +70,6 @@ let sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch; - systemLocale = config.i18n.defaultLocale or "en-US"; - policies = { DisableAppUpdate = true; }; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 54703f5a20f4..15de1a763d90 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -251,8 +251,10 @@ stdenv.mkDerivation rec { # and wants these ++ lib.optionals isTorBrowserLike ([ "--with-tor-browser-version=${tbversion}" + "--with-distribution-id=org.torproject" "--enable-signmar" "--enable-verify-mar" + "--enable-bundled-fonts" ]) ++ flag alsaSupport "alsa" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2e5ecfe58fc5..537e050cf3b4 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -232,16 +232,16 @@ in rec { }; tor-browser-8-0 = tbcommon rec { - ffversion = "60.5.1esr"; - tbversion = "8.0.6"; + ffversion = "60.6.1esr"; + tbversion = "8.0.8"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.5.1esr-8.0-1-slnos" - rev = "89be91fc7cbc420b7c4a3bfc36d2b0d500dd3ccf"; - sha256 = "022zjfwsdl0dkg6ck2kha4nf91xm3j9ag5n21zna98szg3x82dj1"; + # branch "tor-browser-60.6.1esr-8.0-1-slnos" + rev = "dda14213c550afc522ef0bb0bb1643289c298736"; + sha256 = "0lj79nczcix9mx6d0isbizg0f8apf6vgkp7r0q7id92691frj7fz"; }; }; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2f8f020dd9be..b6ccfdd921db 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.6.0"; + version = "1.6.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1pkbzhd5syn7m8q0i7zlxjdgd693z0gj0h22nkc48zjkn214w236"; + sha256 = "1sckfp9l2jgg29p2p4vmd0g7yzbldimqy0a0jvf488yp47qj310p"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 3c1273876002..283c63dcd6fc 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0.6"; + version = "8.0.8"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "14i32r8pw749ghigqblnbr5622jh5wp1ivnwi71vycbgp9pds4f7"; + sha256 = "14ckbhfiyv01cxnd98iihfz7xvrgcd5k4j7pn9ag4a6xb2l80sxi"; }; "i686-linux" = fetchurl { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 8c8212e9e2c8..2c6940e037cd 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -340,9 +340,7 @@ stdenv.mkDerivation rec { `tor-browser-bundle` needs for the bundling using a much simpler patch. See the longDescription and expression of the `firefoxPackages.tor-browser` package for more info. ''; - homepage = https://torproject.org/; - license = licenses.free; - platforms = [ "x86_64-linux" ]; + inherit (tor-browser-unwrapped.meta) homepage platforms license; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index d6e703f79d05..19194c2d0873 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kompose-${version}"; - version = "1.9.0"; + version = "1.18.0"; goPackagePath = "github.com/kubernetes/kompose"; @@ -10,14 +10,14 @@ buildGoPackage rec { rev = "v${version}"; owner = "kubernetes"; repo = "kompose"; - sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86"; + sha256 = "1hb4bs710n9fghphhfakwg42wjscf136dcr05zwwfg7iyqx2cipc"; }; meta = with stdenv.lib; { description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; homepage = https://github.com/kubernetes/kompose; license = licenses.asl20; - maintainers = with maintainers; [thpham]; + maintainers = with maintainers; [ thpham vdemeester ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 84e48ced284c..a171ce38485d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -714,4 +714,11 @@ version = "0.2.0"; sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; }; + ansible = + { + owner = "nbering"; + repo = "terraform-provider-ansible"; + version = "0.0.4"; + sha256 = "125a8vbpnahaxxrxj3mp0kj6ajssxnfb6l0spgnf118wg3bvlmw5"; + }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt index 3352fb79f1e7..c5d6fda16514 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt @@ -20,3 +20,6 @@ tweag/terraform-provider-secret # include terraform-provider-segment ajbosco/terraform-provider-segment + +# include terraform-provider-ansible +nbering/terraform-provider-ansible diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 561c405fd808..8b5f1ce3425c 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,23 +3,15 @@ rustPlatform.buildRustPackage rec { name = "newsboat-${version}"; - version = "2.14.1"; + version = "2.15"; src = fetchurl { url = "https://newsboat.org/releases/${version}/${name}.tar.xz"; - sha256 = "0rnz61in715xgma6phvmn5bil618gic01f3kxzhcfgqsj2qx7l2b"; + sha256 = "1dqdcp34jmphqf3d8ik0xdhg0s66nd5rky0y8y591nidq29wws6s"; }; cargoSha256 = "05pf020jp20ffmvin6d1g8zbwf1zk03bm1cb99b7iqkk4r54g6dn"; - cargoPatches = [ - # Bump versions in Cargo.lock - (fetchpatch { - url = https://github.com/newsboat/newsboat/commit/cbad27a19d270f2f0fce9317651e2c9f0aa22865.patch; - sha256 = "05n31b6mycsmzilz7f3inkmav34210c4nlr1fna4zapbhxjdlhqn"; - }) - ]; - postPatch = '' substituteInPlace Makefile --replace "|| true" "" # Allow other ncurses versions on Darwin diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index a22b72b2f1b2..464722612c7d 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.15"; - previewVersion = "2.2.0a2"; + previewVersion = "2.2.0a3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "1lvdff4yfavfkjmdbhxqfxdd5nq77c2vyy2wnsdliwnmdh3fhm28"; + sha256Hash = "110mghkhanz92p8vfzyh4199mnihb24smxsc44a8v534ds6hww74"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "033bi1bcw5ss6g380qnam1qqyi4bz1cykbb3lparb8hryikicdb9"; + sha256Hash = "104pvrba7n9gp7mx31xg520cfahcy0vsmbzx23007c50kp0nxc56"; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index edcf154dc77a..aefde289db59 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.5.1"; + name = "bitlbee-3.6"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "0sgsn0fv41rga46mih3fyv65cvfa6rvki8x92dn7bczbi7yxfdln"; + sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2201efdc028a..35286d6a2b18 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1gwz47wi9g9g9zzf46ry3q9s855rvlcjlg3dsxr1xdvz4arci195"; + sha256 = "0m0kdnw0pc84yasnybfh9hmkajji0wjk2snv89crdi79s8k572ki"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f78e7bb99299..e088bb7666e0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1bdl2najrbwvfbl5wy1m8vlr4lj6gmngillnyqlxasvjz355rlwr"; + sha256 = "1i0s0pd67hcwc8m2xyydxky76yq796lg2h91lw7n9xi7lvpg5m4s"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index ece9c1089fad..76880c92c133 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.3.7"; + version = "3.3.8"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -48,7 +48,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 = "1q3866iaby8rqim8h2m398wzi0isnnlsxirlq63fzz7a4g1hnc8p"; + sha256 = "02435zvpyr95fljx3xgqz0b0npim1j0611p4rc1azwgdf8hjn11p"; } 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 7392d67ccb6b..a37377835f5f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.6.1"; - sha256Hash = "1gy5al5m1hks0z98cya9kkfinh6k1i8a1d97cy7x6gj0jgmgs88k"; + version = "1.6.3"; + sha256Hash = "1bm0m1y3cf0zmaasz1wfkbz5fy9wm7ivyjn9bzs87yrvlj9x7wqz"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "429149"; archPatchesHash = "1ylpi9kb6hk27x9wmna4ing8vzn9b7247iya91pyxxrpxrcrhpli"; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index cffe74a0e806..24529d83e04c 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python36Packages }: +{ stdenv, fetchpatch, python36Packages }: with stdenv.lib; @@ -19,6 +19,13 @@ buildPythonPackage rec { checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; + patches = [ + (fetchpatch { + url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch"; + sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3"; + }) + ]; + checkPhase = '' TMP_TURSES=`echo turses-$RANDOM` mkdir $TMP_TURSES @@ -26,7 +33,7 @@ buildPythonPackage rec { rm -rf $TMP_TURSES ''; - patchPhase = '' + postPatch = '' sed -i -e 's|urwid==1.3.0|urwid==${getVersion urwid}|' setup.py sed -i -e "s|future==0.14.3|future==${getVersion future}|" setup.py sed -i -e "s|tweepy==3.3.0|tweepy==${getVersion tweepy}|" setup.py @@ -35,7 +42,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alejandrogomez/turses; + homepage = https://github.com/louipc/turses; description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ garbas ]; diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 8d0022e3c8b3..d6e25ae4e7b5 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -38,51 +38,30 @@ let }; }); - versionInfo = { - "13.8.0" = { - major = "13"; - minor = "8"; - patch = "0"; - x64hash = "FDF5991CCD52B2B98289D7B2FB46D492D3E4032846D4AFA52CAA0F8AC0578931"; - x86hash = "E0CFB43312BF79F753514B11F7B8DE4529823AE4C92D1B01E8A2C34F26AC57E7"; - x64suffix = "10299729"; - x86suffix = "10299729"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-138.html; + versionInfo = let + supportedVersions = { + "13.10.0" = { + major = "13"; + minor = "10"; + patch = "0"; + x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; + x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; + x64suffix = "20"; + x86suffix = "20"; + homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; + }; }; - "13.9.0" = { - major = "13"; - minor = "9"; - patch = "0"; - x64hash = "00l18s7i9yky3ddabwljwsf7fx4cjgjn9hfd74j0x1v4gl078nl9"; - x86hash = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag"; - x64suffix = "102"; - x86suffix = "102"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh* - }; - - "13.9.1" = { - major = "13"; - minor = "9"; - patch = "1"; - x64hash = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC"; - x86hash = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483"; - x64suffix = "6"; - x86suffix = "6"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-1391.html; - }; - - "13.10.0" = { - major = "13"; - minor = "10"; - patch = "0"; - x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; - x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; - x64suffix = "20"; - x86suffix = "20"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; - }; - }; + # break an evaluation for old Citrix versions rather than exiting with + # an "attribute name not found" error to avoid confusion. + deprecatedVersions = let + versions = [ "13.8.0" "13.9.0" "13.9.1" ]; + in + lib.listToAttrs + (lib.flip map versions + (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}"))); + in + deprecatedVersions // supportedVersions; citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index e4b89ef36100..31e74ccf23a1 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, wrapGAppsHook, gobject-introspection -, gnome3, libappindicator-gtk3, libnotify }: +, gtksourceview3, libappindicator-gtk3, libnotify }: python3Packages.buildPythonApplication rec { name = "autokey-${version}"; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { # Note: no dependencies included for Qt GUI because Qt ui is poorly # maintained—see https://github.com/autokey/autokey/issues/51 - buildInputs = [ wrapGAppsHook gobject-introspection gnome3.gtksourceview + buildInputs = [ wrapGAppsHook gobject-introspection gtksourceview3 libappindicator-gtk3 libnotify ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index f5fc705eed4c..9c14ffdbbfdd 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "2"; - patch = "1"; + patch = "2"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0p2r48n27v5ifbj3cb9bs38nb6699awmdqx4shy1c6p28b24y78f"; + sha256 = "0s8zwc2bp1zs7hvyhjz0hpb8w97jm0cdb179p56z7svvmald6fmq"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 9113eedc06cd..a7f24fdf1f38 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme -, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false }: @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "180d4rrzb3lq7g2w7x512fn8chfkjg4ld20ikrj6hkg11kj4hbmy"; + sha256 = "0i8pmgdm0i6klb06s3nwad9xz4whbvb5mjjqjqvl6fh0flk6zs1p"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "06fgd5jkqqbvskyj1ywmsmb4crsj064s8r45nrv0r8j6ydn0hi1l"; + sha256 = "14hd6rnq9316p78zharqznps80mxxwz3n80zm15cpj3xg3dr57v1"; }; }; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index e9eeacf63b52..fda975a9031a 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -56,11 +56,11 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.15.12.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.15.12.tar.xz"; - sha256 = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9"; + name = "cairo-1.16.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz"; + sha256 = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"; md5 = ""; - md5name = "7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9-cairo-1.15.12.tar.xz"; + md5name = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331-cairo-1.16.0.tar.xz"; } { name = "libcdr-0.1.5.tar.xz"; @@ -658,11 +658,11 @@ md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openssl-1.0.2p.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"; - sha256 = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00"; + name = "openssl-1.0.2r.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz"; + sha256 = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6"; md5 = ""; - md5name = "50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00-openssl-1.0.2p.tar.gz"; + md5name = "ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6-openssl-1.0.2r.tar.gz"; } { name = "liborcus-0.14.1.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 1da6160e85bb..1b7d2b0987f8 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gnome3, glib, ncurses, epoxy, gpgme -, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] +, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false }: diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh index cff8f200e2bc..62569734745c 100644 --- a/pkgs/applications/office/libreoffice/wrapper.sh +++ b/pkgs/applications/office/libreoffice/wrapper.sh @@ -5,7 +5,13 @@ export JAVA_HOME="${JAVA_HOME:-@jdk@}" if uname | grep Linux > /dev/null && ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus" - mkdir "$dbus_tmp_dir" + if ! test -d "$dbus_tmp_dir" && test -d "/run"; then + mkdir -p "$dbus_tmp_dir" + fi + if ! test -d "$dbus_tmp_dir"; then + dbus_tmp_dir="/tmp/libreoffice-$(id -u)/libreoffice-dbus" + mkdir -p "$dbus_tmp_dir" + fi dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")" "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session" &> /dev/null & export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix new file mode 100644 index 000000000000..804e71c1bfa7 --- /dev/null +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, hmmer, perl }: + +stdenv.mkDerivation rec { + version = "1.1.1"; + name = "itsx-${version}"; + + src = fetchurl { + url = "http://microbiology.se/sw/ITSx_${version}.tar.gz"; + sha256 = "0lrmy2n3ax7f208k0k8l3yz0j5cpz05hv4hx1nnxzn0c51z1pc31"; + }; + + buildInputs = [ hmmer perl ]; + + buildPhase = '' + sed -e "s,profileDB = .*,profileDB = \"$out/share/ITSx_db/HMMs\";," -i ITSx + sed "3 a \$ENV{\'PATH\'}='${hmmer}/bin:'.\"\$ENV{\'PATH\'}\";" -i ITSx + mkdir bin + mv ITSx bin + ''; + + installPhase = '' + mkdir -p $out/share/doc && cp -a bin $out/ + cp *pdf $out/share/doc + cp -r ITSx_db $out/share + ''; + + meta = with stdenv.lib; { + description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing"; + homepage = http://microbiology.se/software/itsx/; + license = licenses.gpl3; + maintainers = [ maintainers.bzizou ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix new file mode 100644 index 000000000000..dbbf8d39a93c --- /dev/null +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, gcc, gcc-unwrapped }: + +stdenv.mkDerivation rec { + version = "3.2.1"; + name = "messer-slim-${version}"; + + src = fetchurl { + url = "https://github.com/MesserLab/SLiM/archive/v${version}.tar.gz"; + sha256 = "1j3ssjvxpsc21mmzj59kwimglz8pdazi5w6wplmx11x744k77wa1"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; + + cmakeFlags = [ "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" ]; + + meta = { + description = "An evolutionary simulation framework"; + homepage = https://messerlab.org/slim/; + license = with stdenv.lib.licenses; [ gpl3 ]; + maintainers = with stdenv.lib.maintainers; [ bzizou ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 5104d1012b2f..61ebed896875 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, intltool, autoreconfHook, pkgconfig, libqalculate, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "qalculate-gtk-${version}"; - version = "2.9.0"; + pname = "qalculate-gtk"; + version = "3.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0c5s7mz8xwwmzc22yai8vqiww7paafkyi7khp8a2yws78m2nirdx"; + sha256 = "00q6y9dgg9wgpgks79snbipn8alfjajlx02a5hm7wl9a20zd0b81"; }; patchPhase = '' diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index a682d59ab23a..f0ac310ea665 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { - name = "gromacs-2019"; + name = "gromacs-2019.1"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz"; - sha256 = "02qd27pgc5kwkk68m8hwarkbb1b9z5rdrm67yjqyxd5my2jq3cn5"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.1.tar.gz"; + sha256 = "1v438nf6viwpl53ydrljf598cf8lh7jqxp5bzi74rrnhzk97xhxj"; }; buildInputs = [cmake fftw] diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index c2afda2d53d9..a0917d03ce11 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg_utils, gnome3, pythonPackages, hicolor-icon-theme, + findutils, xdg_utils, gnome3, gtk3, pythonPackages, hicolor-icon-theme, wrapGAppsHook }: @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { ]; buildInputs = [ - gnome3.gtk + gtk3 gnome3.dconf pythonPackages.pyxdg pythonPackages.ptyprocess diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3298bc167517..e15709191bfd 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.5", - "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", - "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", + "version": "11.9.1", + "repo_hash": "11dx931n79ynw8j6vbjsb832dkkp2s4vzji53km4ib9njn5nja0l", + "deb_hash": "133qjxmrn2rl9avi0nwcdbky53vgxbzp4g3vcgwg21xyfr8k8s4n", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.9.1-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.5", + "rev": "v11.9.1", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.27.1", + "GITLAB_PAGES_VERSION": "1.5.0", + "GITLAB_SHELL_VERSION": "8.7.1", + "GITLAB_WORKHORSE_VERSION": "8.3.1" } }, "ee": { - "version": "11.7.5", - "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", - "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", + "version": "11.9.1", + "repo_hash": "13d6vg505rifgxpks9b7x2zq65b41naj7znkzm5i1kdvklfygqpd", + "deb_hash": "1z5i04cxwgcmx55yzhpw0ss1rwaqz1jl6hwpgbyly6prrbl5h59x", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.9.1-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.5-ee", + "rev": "v11.9.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "1.12.2", - "GITLAB_PAGES_VERSION": "1.3.1", - "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.2" + "GITALY_SERVER_VERSION": "1.27.1", + "GITLAB_PAGES_VERSION": "1.5.0", + "GITLAB_SHELL_VERSION": "8.7.1", + "GITLAB_WORKHORSE_VERSION": "8.3.1" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 81f1864099f3..8a8ce5771cf4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -3,10 +3,10 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 gem 'bundler', '>= 1.16.5' -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.6.5' -gem 'gitaly-proto', '~> 1.3.0' +gem 'gitaly-proto', '~> 1.13.0' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2', require: false @@ -14,6 +14,7 @@ gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false gem 'grpc', '~> 1.15.0' gem 'sentry-raven', '~> 2.7.2', require: false gem 'faraday', '~> 0.12' +gem 'rbtrace', require: false # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE @@ -27,4 +28,11 @@ group :development, :test do gem 'rspec-parameterized', require: false gem 'timecop', require: false gem 'factory_bot', require: false + gem 'pry', '~> 0.12.2', require: false + + # gitlab-shell spec gems + gem 'listen', '~> 0.5.0' + gem 'simplecov', '~> 0.9.0', require: false + gem 'vcr', '~> 4.0.0' + gem 'webmock', '~> 3.4.0' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 59f8ad69f223..4deb64c4cd5b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -10,6 +10,8 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) ast (2.4.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) @@ -19,18 +21,22 @@ GEM adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.3) + crack (0.4.3) + safe_yaml (~> 1.0.0) crass (1.0.4) debug_inspector (0.0.3) diff-lcs (1.3) + docile (1.1.5) equalizer (0.0.11) escape_utils (1.2.1) factory_bot (4.11.1) activesupport (>= 3.0.0) faraday (0.15.3) multipart-post (>= 1.2, < 3) + ffi (1.10.0) gemojione (3.3.0) json - gitaly-proto (1.3.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-linguist (6.2.0) charlock_holmes (~> 0.7.6) @@ -58,29 +64,35 @@ GEM gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) grpc (1.15.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) + hashdiff (0.3.8) i18n (1.1.1) concurrent-ruby (~> 1.0) ice_nine (0.11.2) json (2.1.0) licensee (8.9.2) rugged (~> 0.24) + listen (0.5.3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) + method_source (0.9.2) mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) + msgpack (1.2.6) + multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri + optimist (3.0.0) parallel (1.12.1) parser (2.5.3.0) ast (~> 2.4.0) @@ -91,7 +103,15 @@ GEM parser unparser procto (0.0.3) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.3) rainbow (3.0.0) + rbtrace (0.4.11) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + optimist (>= 3.0.0) rdoc (4.3.0) rouge (3.3.0) rspec (3.7.0) @@ -121,13 +141,19 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.10.0) - rugged (0.27.5) + rugged (0.28.0) + safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.7.2) + sentry-raven (2.7.4) faraday (>= 0.7.6, < 1.0) + simplecov (0.9.2) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) stringex (2.8.4) thread_safe (0.3.6) timecop (0.9.1) @@ -142,6 +168,11 @@ GEM equalizer (~> 0.0.9) parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) + vcr (4.0.0) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff PLATFORMS ruby @@ -151,7 +182,7 @@ DEPENDENCIES bundler (>= 1.16.5) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.3.0) + gitaly-proto (~> 1.13.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) @@ -159,13 +190,19 @@ DEPENDENCIES google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) + listen (~> 0.5.0) + pry (~> 0.12.2) + rbtrace rdoc (~> 4.2) rspec rspec-parameterized rubocop (~> 0.50) - rugged (~> 0.27) + rugged (~> 0.28) sentry-raven (~> 2.7.2) + simplecov (~> 0.9.0) timecop + vcr (~> 4.0.0) + webmock (~> 3.4.0) BUNDLED WITH - 1.17.1 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 349b75f19347..d84406e23b3d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "1.12.2"; + version = "1.27.1"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0pg3pm34jnssvh8m99d6w3ap1kn6kn3akqaa17zxv9y0xryvchpy"; + sha256 = "0sr1jjw1rvyxrv6vaqvl138m0x2xgjksjdy92ajslrjxrnjlrjvp"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index c06be7891ffb..61abc97ed548 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -25,6 +25,15 @@ }; version = "0.2.0"; }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; ast = { source = { remotes = ["https://rubygems.org"]; @@ -75,6 +84,15 @@ }; version = "1.1.3"; }; + crack = { + dependencies = ["safe_yaml"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; crass = { source = { remotes = ["https://rubygems.org"]; @@ -99,6 +117,14 @@ }; version = "1.3"; }; + docile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; equalizer = { source = { remotes = ["https://rubygems.org"]; @@ -133,6 +159,14 @@ }; version = "0.15.3"; }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + type = "gem"; + }; + version = "1.10.0"; + }; gemojione = { dependencies = ["json"]; source = { @@ -146,10 +180,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17fg29j089k94ssim9hfzpd5lycvhimbpvz12d73ywrbwz7a7680"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.3.0"; + version = "1.13.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; @@ -224,10 +258,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -238,6 +272,14 @@ }; version = "1.15.0"; }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; + type = "gem"; + }; + version = "0.3.8"; + }; i18n = { dependencies = ["concurrent-ruby"]; source = { @@ -272,6 +314,14 @@ }; version = "8.9.2"; }; + listen = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; + type = "gem"; + }; + version = "0.5.3"; + }; memoizable = { dependencies = ["thread_safe"]; source = { @@ -281,6 +331,14 @@ }; version = "0.4.2"; }; + method_source = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; mime-types = { dependencies = ["mime-types-data"]; source = { @@ -301,10 +359,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -314,6 +372,22 @@ }; version = "5.11.3"; }; + msgpack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; + type = "gem"; + }; + version = "1.2.6"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; multipart-post = { source = { remotes = ["https://rubygems.org"]; @@ -326,10 +400,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -340,6 +414,14 @@ }; version = "1.5.0"; }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; parallel = { source = { remotes = ["https://rubygems.org"]; @@ -390,6 +472,23 @@ }; version = "0.0.3"; }; + pry = { + dependencies = ["coderay" "method_source"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; rainbow = { source = { remotes = ["https://rubygems.org"]; @@ -398,6 +497,15 @@ }; version = "3.0.0"; }; + rbtrace = { + dependencies = ["ffi" "msgpack" "optimist"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; + type = "gem"; + }; + version = "0.4.11"; + }; rdoc = { source = { remotes = ["https://rubygems.org"]; @@ -487,10 +595,18 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; + }; + safe_yaml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; @@ -505,10 +621,27 @@ dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + sha256 = "0l0bci35amy7pqv81djyjcx023q4qylmq8a2zbx14zh6ifzib4f4"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.4"; + }; + simplecov = { + dependencies = ["docile" "multi_json" "simplecov-html"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; + type = "gem"; + }; + version = "0.9.2"; + }; + simplecov-html = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + type = "gem"; + }; + version = "0.9.0"; }; stringex = { source = { @@ -560,4 +693,21 @@ }; version = "0.2.8"; }; + vcr = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; + type = "gem"; + }; + version = "4.0.0"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; + type = "gem"; + }; + version = "3.4.2"; + }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index bb48a441253f..c3199142da3f 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "8.4.4"; + version = "8.7.1"; name = "gitlab-shell-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1a6p13g38f4gqqfjgymcvf09k4mnr2bfpj8mqz0x6rz7q67lllcq"; + sha256 = "0x9jlgd5s5zhdv7fzxba74zjigvd7v5h045y7gny53lf8xda68ia"; }; buildInputs = [ ruby bundler go ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 7819c863a359..9b5efeaee801 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,16 +1,16 @@ diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index 435cb29..078c1df 100644 +index f951fe6..b422fe3 100644 --- a/go/internal/config/config.go +++ b/go/internal/config/config.go -@@ -2,7 +2,6 @@ package config - +@@ -3,7 +3,6 @@ package config import ( "io/ioutil" + "net/url" - "os" "path" + "strings" - yaml "gopkg.in/yaml.v2" -@@ -26,16 +25,13 @@ type Config struct { +@@ -30,16 +29,13 @@ type Config struct { } func New() (*Config, error) { @@ -28,12 +28,25 @@ index 435cb29..078c1df 100644 + return newFromFile("/run/gitlab/shell-config.yml") } - func newFromFile(filename string) (*Config, error) { + func (c *Config) FeatureEnabled(featureName string) bool { +diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb +index 0600a18..c46f2d7 100644 +--- a/lib/gitlab_keys.rb ++++ b/lib/gitlab_keys.rb +@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength + attr_accessor :auth_file, :key + + def self.command(whatever) +- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" ++ "/run/current-system/sw/bin/gitlab-shell #{whatever}" + end + + def self.command_key(key_id) diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index 57c70f5..700569b 100644 +index 2cb76a8..f59ad5e 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb -@@ -187,7 +187,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength +@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength args = [executable, gitaly_address, json_args] # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. @@ -43,16 +56,3 @@ index 57c70f5..700569b 100644 end def api -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..6814f0a 100644 ---- a/lib/gitlab_keys.rb -+++ b/lib/gitlab_keys.rb -@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength - attr_accessor :auth_file, :key - - def self.command(whatever) -- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" -+ "/run/current-system/sw/bin/gitlab-shell #{whatever}" - end - - def self.command_key(key_id) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index c49bbe9ccef7..6540ee0be963 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.2"; + version = "8.3.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; + sha256 = "14zmxajzx6r2wrsxkmqp7j94yxnq4qpg27wih5l8lhf1imzgnk3j"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile index f59e61208ac3..f36e2e38d6be 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile @@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' @@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -94,13 +94,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.3' +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0' +gem 'fog-google', '~> 1.8' +gem 'fog-local', '~> 0.6' +gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -113,10 +115,9 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' +gem 'deckar01-task_list', '2.2.0' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' @@ -126,9 +127,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' +gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -144,7 +145,7 @@ gem 'diffy', '~> 3.1.0' gem 'rack', '2.0.6' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -161,12 +162,12 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.1' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -185,10 +186,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -203,9 +204,6 @@ gem 'connection_pool', '~> 2.0' # Discord integration gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false -# HipChat integration -gem 'hipchat', '~> 1.5.0' - # JIRA integration gem 'jira-ruby', '~> 1.4' @@ -225,7 +223,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -305,6 +303,12 @@ group :metrics do gem 'raindrops', '~> 0.18' end +group :tracing do + # OpenTracing + gem 'opentracing', '~> 0.4.3' + gem 'jaeger-client', '~> 0.10.0' +end + group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false @@ -321,7 +325,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -378,7 +382,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -408,7 +412,7 @@ gem 'sys-filesystem', '~> 1.1.6' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -417,7 +421,8 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' + gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock index 77b4360cf413..1be6f2289544 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock @@ -85,7 +85,7 @@ GEM binding_ninja (0.2.2) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -113,6 +113,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) + character_set (1.1.2) charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) @@ -143,7 +144,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -185,7 +186,7 @@ GEM erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.1.7) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -206,7 +207,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -217,32 +218,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + mime-types + fog-google (1.8.2) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) google-api-client (~> 0.23.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (1.0.8) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -258,6 +260,9 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.1.7) + et-orbi (~> 1.1, >= 1.1.7) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -274,7 +279,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -282,11 +287,11 @@ GEM gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) + gitlab-styles (2.5.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -305,7 +310,7 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -353,15 +358,12 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + hashdiff (0.3.8) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -389,13 +391,18 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 0.5.0) + js_regex (3.1.1) + character_set (~> 1.1) + regexp_parser (~> 1.1) + regexp_property_values (~> 0.3) json (1.8.6) json-jwt (1.9.4) activesupport @@ -416,10 +423,10 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -462,9 +469,9 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -477,8 +484,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -544,6 +551,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -575,7 +584,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.3) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -606,6 +615,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) + raabro (1.1.6) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -618,7 +628,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -657,23 +667,22 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -693,7 +702,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.3.0) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -775,9 +785,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.0) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -816,12 +824,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -847,7 +856,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -868,6 +877,7 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) + thrift (0.11.0.0) tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) @@ -875,10 +885,9 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -890,7 +899,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -908,7 +917,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -917,7 +926,7 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -957,7 +966,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) + bootsnap (~> 1.4) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) browser (~> 2.5) @@ -974,7 +983,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -994,27 +1003,28 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.3) + fog-core (= 2.1.0) + fog-google (~> 1.8) + fog-local (~> 0.6) + fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) + fugit (~> 1.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) @@ -1031,20 +1041,20 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar influxdb (~> 0.2) + jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) + kubeclient (~> 4.2.2) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1059,7 +1069,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1077,6 +1087,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) + opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1084,7 +1095,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) @@ -1107,7 +1118,6 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) - redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1128,8 +1138,7 @@ DEPENDENCIES ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) sass (~> 3.5) sass-rails (~> 5.0.6) @@ -1142,14 +1151,14 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1157,17 +1166,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix index 10b8c3f25ead..f3e2dd91d556 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix @@ -309,10 +309,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { source = { @@ -407,6 +407,14 @@ }; version = "0.1"; }; + character_set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + type = "gem"; + }; + version = "1.1.2"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -587,10 +595,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -772,10 +780,10 @@ dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.7"; }; eventmachine = { source = { @@ -881,10 +889,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -925,64 +933,64 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; type = "gem"; }; - version = "2.0.1"; + version = "3.3.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1028,6 +1036,15 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + type = "gem"; + }; + version = "1.1.7"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1085,10 +1102,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.5.0"; + version = "1.13.0"; }; github-markup = { source = { @@ -1130,19 +1147,19 @@ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1183,10 +1200,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1306,10 +1323,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1337,15 +1354,6 @@ }; version = "2.6.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -1465,6 +1473,15 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1483,13 +1500,13 @@ version = "1.3.2"; }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1563,10 +1580,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1581,10 +1598,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1743,10 +1760,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1759,10 +1776,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -1857,10 +1874,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2067,6 +2084,22 @@ }; version = "2.2.3"; }; + opentracing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf"; + type = "gem"; + }; + version = "0.4.3"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2174,10 +2207,10 @@ pg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.3"; }; po_to_json = { dependencies = ["json"]; @@ -2299,6 +2332,14 @@ }; version = "0.0.3.3"; }; + raabro = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; + type = "gem"; + }; + version = "1.1.6"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -2346,10 +2387,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2443,10 +2484,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2483,13 +2524,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2524,14 +2565,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2605,10 +2638,18 @@ regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq"; type = "gem"; }; - version = "0.5.0"; + version = "1.3.0"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -2895,22 +2936,13 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; }; safe_yaml = { source = { @@ -3045,22 +3077,22 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.5"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3151,10 +3183,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3256,6 +3288,14 @@ }; version = "0.3.6"; }; + thrift = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + type = "gem"; + }; + version = "0.11.0.0"; + }; tilt = { source = { remotes = ["https://rubygems.org"]; @@ -3298,22 +3338,14 @@ }; version = "1.0.0"; }; - trollop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; - type = "gem"; - }; - version = "2.1.3"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3378,10 +3410,10 @@ dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3421,10 +3453,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3456,10 +3488,10 @@ dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile index f01944a0e877..2847bd3e6c27 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile @@ -16,9 +16,9 @@ gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'pg', '~> 1.1', group: :postgres -gem 'rugged', '~> 0.27' +gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.0' gem 'faraday', '~> 0.12' @@ -71,7 +71,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API @@ -97,13 +97,15 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick' # for backups -gem 'fog-aws', '~> 2.0.1' -gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.7.1' -gem 'fog-local', '~> 0.3' -gem 'fog-openstack', '~> 0.1' +gem 'fog-aws', '~> 3.3' +# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. +# Also see config/initializers/fog_core_patch.rb. +gem 'fog-core', '= 2.1.0' +gem 'fog-google', '~> 1.8' +gem 'fog-local', '~> 0.6' +gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.2.0' +gem 'fog-aliyun', '~> 0.3' # for Google storage gem 'google-api-client', '~> 0.23' @@ -123,10 +125,9 @@ gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.0.0' +gem 'deckar01-task_list', '2.2.0' gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.0' @@ -136,9 +137,9 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 3.1' -gem 'truncato', '~> 0.7.9' +gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 2.7.0' -gem 'nokogiri', '~> 1.8.5' +gem 'nokogiri', '~> 1.10.1' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -154,7 +155,7 @@ gem 'diffy', '~> 3.1.0' gem 'rack', '2.0.6' group :unicorn do - gem 'unicorn', '~> 5.1.0' + gem 'unicorn', '~> 5.4.1' gem 'unicorn-worker-killer', '~> 0.4.4' end @@ -171,12 +172,12 @@ gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.2.1' -gem 'sidekiq-cron', '~> 0.6.0' +gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'rufus-scheduler', '~> 3.4' +gem 'fugit', '~> 1.1' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -195,10 +196,10 @@ gem 're2', '~> 1.1.1' # Misc -gem 'version_sorter', '~> 2.1.0' +gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 2.2.1' +gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' @@ -213,9 +214,6 @@ gem 'connection_pool', '~> 2.0' # Discord integration gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false -# HipChat integration -gem 'hipchat', '~> 1.5.0' - # JIRA integration gem 'jira-ruby', '~> 1.4' @@ -235,7 +233,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.0.0' +gem 'kubeclient', '~> 4.2.2' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -317,6 +315,12 @@ group :metrics do gem 'raindrops', '~> 0.18' end +group :tracing do + # OpenTracing + gem 'opentracing', '~> 0.4.3' + gem 'jaeger-client', '~> 0.10.0' +end + group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false @@ -333,7 +337,7 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.3' + gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -390,7 +394,7 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2', require: false gem 'email_spec', '~> 2.2.0' gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' + gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' @@ -423,7 +427,7 @@ gem 'net-ntp' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -432,7 +436,8 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 1.5.0', require: 'gitaly' +gem 'gitaly-proto', '~> 1.13.0', require: 'gitaly' + gem 'grpc', '~> 1.15.0' gem 'google-protobuf', '~> 3.6' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock index 8d07afb59bf1..251d759be059 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock @@ -93,7 +93,7 @@ GEM binding_ninja (0.2.2) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.3.2) + bootsnap (1.4.1) msgpack (~> 1.0) bootstrap_form (2.7.0) brakeman (4.2.1) @@ -121,6 +121,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) + character_set (1.1.2) charlock_holmes (0.7.6) childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) @@ -151,7 +152,7 @@ GEM database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.0.0) + deckar01-task_list (2.2.0) html-pipeline declarative (0.0.10) declarative-option (0.1.0) @@ -206,7 +207,7 @@ GEM erubi (1.7.1) erubis (2.7.0) escape_utils (1.2.1) - et-orbi (1.0.3) + et-orbi (1.1.7) tzinfo eventmachine (1.2.7) excon (0.62.0) @@ -230,7 +231,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.9.25) + ffi (1.10.0) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -241,32 +242,33 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.2.0) - fog-core (~> 1.27) - fog-json (~> 1.0) + fog-aliyun (0.3.3) + fog-core + fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) + fog-aws (3.3.0) + fog-core (~> 2.1) + fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.45.0) + fog-core (2.1.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-google (1.7.1) - fog-core - fog-json - fog-xml + mime-types + fog-google (1.8.2) + fog-core (<= 2.1.0) + fog-json (~> 1.2) + fog-xml (~> 0.1.0) google-api-client (~> 0.23.0) - fog-json (1.0.2) - fog-core (~> 1.0) + fog-json (1.2.0) + fog-core multi_json (~> 1.10) - fog-local (0.3.1) - fog-core (~> 1.27) - fog-openstack (0.1.21) - fog-core (>= 1.40) + fog-local (0.6.0) + fog-core (>= 1.27, < 3.0) + fog-openstack (1.0.8) + fog-core (~> 2.1) fog-json (>= 1.0) ipaddress (>= 0.8) fog-rackspace (0.1.1) @@ -282,6 +284,9 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) + fugit (1.1.7) + et-orbi (~> 1.1, >= 1.1.7) + raabro (~> 1.1) fuubar (2.2.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) @@ -298,7 +303,7 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.5.0) + gitaly-proto (1.13.0) grpc (~> 1.0) github-markup (1.7.0) gitlab-default_value_for (3.1.1) @@ -307,11 +312,11 @@ GEM gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.4.0) sidekiq (~> 5) - gitlab-styles (2.4.1) + gitlab-styles (2.5.1) rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -330,7 +335,7 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) google-protobuf (3.6.1) - googleapis-common-protos-types (1.0.2) + googleapis-common-protos-types (1.0.3) google-protobuf (~> 3.0) googleauth (0.6.6) faraday (~> 0.12) @@ -380,15 +385,12 @@ GEM thor tilt hangouts-chat (0.0.5) - hashdiff (0.3.4) + hashdiff (0.3.8) hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) rails (>= 4.0) - hipchat (1.5.2) - httparty - mimemagic html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) @@ -416,14 +418,19 @@ GEM cause json ipaddress (0.8.3) + jaeger-client (0.10.0) + opentracing (~> 0.3) + thrift jira-ruby (1.4.1) activesupport multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.3.1) jquery-atwho-rails (1.3.2) - js_regex (2.2.1) - regexp_parser (>= 0.4.11, <= 0.5.0) + js_regex (3.1.1) + character_set (~> 1.1) + regexp_parser (~> 1.1) + regexp_property_values (~> 0.3) json (1.8.6) json-jwt (1.9.4) activesupport @@ -444,10 +451,10 @@ GEM activerecord kaminari-core (= 1.0.1) kaminari-core (1.0.1) - kgio (2.10.0) + kgio (2.11.2) knapsack (1.17.0) rake - kubeclient (4.0.0) + kubeclient (4.2.2) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -490,9 +497,9 @@ GEM mimemagic (0.3.2) mini_magick (4.8.0) mini_mime (1.0.1) - mini_portile2 (2.3.0) + mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -507,8 +514,8 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri numerizer (0.1.1) @@ -574,6 +581,8 @@ GEM activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) + opentracing (0.4.3) + optimist (3.0.0) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) @@ -605,7 +614,7 @@ GEM atomic (>= 1.0.0) peek redis - pg (0.18.4) + pg (1.1.3) po_to_json (1.0.1) json (>= 1.6.0) powerpack (0.1.1) @@ -636,6 +645,7 @@ GEM get_process_mem (~> 0.2) puma (>= 2.7, < 4) pyu-ruby-sasl (0.0.3.3) + raabro (1.1.6) rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) @@ -648,7 +658,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (2.0.4) + rack-protection (2.0.5) rack rack-proxy (0.6.0) rack @@ -687,23 +697,22 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - raindrops (0.18.0) + raindrops (0.19.0) rake (12.3.2) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.10) + rbtrace (0.4.11) ffi (>= 1.0.6) msgpack (>= 0.4.3) - trollop (>= 1.16.2) + optimist (>= 3.0.0) rdoc (6.0.4) re2 (1.1.1) recaptcha (3.0.0) json recursive-open-struct (1.1.0) - redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) @@ -723,7 +732,8 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (0.5.0) + regexp_parser (1.3.0) + regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -805,9 +815,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rufus-scheduler (3.4.0) - et-orbi (~> 1.0) - rugged (0.27.5) + rugged (0.28.0) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -846,12 +854,13 @@ GEM rack shoulda-matchers (3.1.2) activesupport (>= 4.0.0) - sidekiq (5.2.3) + sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (0.6.0) - rufus-scheduler (>= 3.3.0) + sidekiq-cron (1.0.4) + fugit (~> 1.1) sidekiq (>= 4.2.1) signet (0.11.0) addressable (~> 2.3) @@ -877,7 +886,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -898,6 +907,7 @@ GEM rack (>= 1, < 3) thor (0.19.4) thread_safe (0.3.6) + thrift (0.11.0.0) tilt (2.0.8) timecop (0.8.1) timfel-krb5-auth (0.8.3) @@ -905,10 +915,9 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - trollop (2.1.3) - truncato (0.7.10) + truncato (0.7.11) htmlentities (~> 4.3.1) - nokogiri (~> 1.8.0, >= 1.7.0) + nokogiri (>= 1.7.0, <= 2.0) tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) @@ -920,7 +929,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.3.2) - unicorn (5.1.0) + unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -938,7 +947,7 @@ GEM validates_hostname (1.0.6) activerecord (>= 3.0) activesupport (>= 3.0) - version_sorter (2.1.0) + version_sorter (2.2.4) virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) @@ -947,7 +956,7 @@ GEM vmstat (2.3.0) warden (1.2.7) rack (>= 1.0) - webmock (2.3.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -988,7 +997,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) better_errors (~> 2.5.0) binding_of_caller (~> 0.8.0) - bootsnap (~> 1.3) + bootsnap (~> 1.4) bootstrap_form (~> 2.7.0) brakeman (~> 4.2) browser (~> 2.5) @@ -1005,7 +1014,7 @@ DEPENDENCIES connection_pool (~> 2.0) creole (~> 0.5.0) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.0.0) + deckar01-task_list (= 2.2.0) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -1029,28 +1038,29 @@ DEPENDENCIES flipper-active_record (~> 0.13.0) flipper-active_support_cache_store (~> 0.13.0) flowdock (~> 0.7) - fog-aliyun (~> 0.2.0) - fog-aws (~> 2.0.1) - fog-core (~> 1.44) - fog-google (~> 1.7.1) - fog-local (~> 0.3) - fog-openstack (~> 0.1) + fog-aliyun (~> 0.3) + fog-aws (~> 3.3) + fog-core (= 2.1.0) + fog-google (~> 1.8) + fog-local (~> 0.6) + fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) foreman (~> 0.84.0) + fugit (~> 1.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.5.0) + gitaly-proto (~> 1.13.0) github-markup (~> 1.7.0) gitlab-default_value_for (~> 3.1.1) gitlab-license (~> 1.0) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) @@ -1068,20 +1078,20 @@ DEPENDENCIES hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) - hipchat (~> 1.5.0) html-pipeline (~> 2.8) html2text httparty (~> 0.13.3) icalendar influxdb (~> 0.2) + jaeger-client (~> 0.10.0) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - js_regex (~> 2.2.1) + js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.0.0) + kubeclient (~> 4.2.2) letter_opener_web (~> 1.3.0) license_finder (~> 5.4) licensee (~> 8.9) @@ -1098,7 +1108,7 @@ DEPENDENCIES net-ldap net-ntp net-ssh (~> 5.0) - nokogiri (~> 1.8.5) + nokogiri (~> 1.10.1) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1116,6 +1126,7 @@ DEPENDENCIES omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) + opentracing (~> 0.4.3) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) @@ -1123,7 +1134,7 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - pg (~> 0.18.2) + pg (~> 1.1) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) pry-byebug (~> 3.5.1) @@ -1146,7 +1157,6 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 3.0) - redcarpet (~> 3.4) redis (~> 3.2) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) @@ -1167,8 +1177,7 @@ DEPENDENCIES ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) - rufus-scheduler (~> 3.4) - rugged (~> 0.27) + rugged (~> 0.28) sanitize (~> 4.6) sass (~> 3.5) sass-rails (~> 5.0.6) @@ -1181,14 +1190,14 @@ DEPENDENCIES sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) sidekiq (~> 5.2.1) - sidekiq-cron (~> 0.6.0) + sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.14.0) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) @@ -1196,17 +1205,17 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) toml-rb (~> 1.0.0) - truncato (~> 0.7.9) + truncato (~> 0.7.11) u2f (~> 0.2.1) uglifier (~> 2.7.2) unf (~> 0.1.4) - unicorn (~> 5.1.0) + unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) validates_hostname (~> 1.0.6) - version_sorter (~> 2.1.0) + version_sorter (~> 2.2.4) virtus (~> 1.0.1) vmstat (~> 2.3.0) - webmock (~> 2.3.2) + webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix index 03f885f2f9e5..c62c26b2bd10 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix @@ -344,10 +344,10 @@ dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6r784lmjfhwi046w82phsk244byq9wkj1q3lddwxg9z559bmhy"; + sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.1"; }; bootstrap_form = { source = { @@ -442,6 +442,14 @@ }; version = "0.1"; }; + character_set = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + type = "gem"; + }; + version = "1.1.2"; + }; charlock_holmes = { source = { remotes = ["https://rubygems.org"]; @@ -622,10 +630,10 @@ dependencies = ["html-pipeline"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6qsk712ic6vx9ydmix2ys95zwpkvdx3a9xxi8bdqlpgh1ipm9j"; + sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; declarative = { source = { @@ -851,10 +859,10 @@ dependencies = ["tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1apn9gzgbgs7z6p6l3rv66vrfwyfh68p2rxkybh10vx82fp6g0wi"; + sha256 = "148z57yshd8rls5b9mkqp9dymba8r4373vlrsk3090lblw5v1ifp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.7"; }; eventmachine = { source = { @@ -969,10 +977,10 @@ ffi = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; + sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; type = "gem"; }; - version = "1.9.25"; + version = "1.10.0"; }; flipper = { source = { @@ -1013,64 +1021,64 @@ dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x66xyrw4ahyr6f9masiqmz5q6h8scv46y59crnfp8dj7r52hw8m"; + sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.3"; }; fog-aws = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; + sha256 = "1zprxg0spvkkri1jf40zg3rfr5h2gq6009d7l36lifpvhjn658cs"; type = "gem"; }; - version = "2.0.1"; + version = "3.3.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; + sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; type = "gem"; }; - version = "1.45.0"; + version = "2.1.0"; }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azs1i061ig0x1cljdy68hjskzj8d25xkq8nqf3z7qya5lmfn1z2"; + sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.2"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r"; + sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; type = "gem"; }; - version = "1.0.2"; + version = "1.2.0"; }; fog-local = { dependencies = ["fog-core"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1hyga02l9civ0b9gvfdmscvwv2jr4dq87q2g3qxh2974x213mn"; + sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; type = "gem"; }; - version = "0.3.1"; + version = "0.6.0"; }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ii0q22bdv170f7b007k9jlph40rn7fnzd84vaxhf4zhjhaijmys"; + sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; type = "gem"; }; - version = "0.1.21"; + version = "1.0.8"; }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; @@ -1116,6 +1124,15 @@ }; version = "0.2.5"; }; + fugit = { + dependencies = ["et-orbi" "raabro"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1j1v66sdbj9gxkwlndgxa61fra069hx3cp1dk4p1agzr7rmmzf"; + type = "gem"; + }; + version = "1.1.7"; + }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; source = { @@ -1173,10 +1190,10 @@ dependencies = ["grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7c63saysp4ixj08kxrk5c4n94d6zala9wl1fxg7vx8nd84b2c0"; + sha256 = "1q1zf8alrxvh479fd2ywq89d1n5flkk5v2n7sdlpfhjdilxfcjkn"; type = "gem"; }; - version = "1.5.0"; + version = "1.13.0"; }; github-markup = { source = { @@ -1226,19 +1243,19 @@ dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-rspec"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ywizn3191mjl7ibxlfajaxm5vkywwl4i9q2xh6miq37nk2q98dx"; + sha256 = "0nkciak0qq17pqc667nkdjx0vp8kk9w27d6jmimvi6cjzb38zmqa"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cpjadx852vw1gv5cm1qiqq6mclglzqajw7q572zncw4q3ji2fkv"; + sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; type = "gem"; }; - version = "2.0.4"; + version = "2.1.1"; }; globalid = { dependencies = ["activesupport"]; @@ -1279,10 +1296,10 @@ dependencies = ["google-protobuf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ds7g01pxqm3mg283xjzy0lhhvvhvzw3m7gf7szd1r7la4wf0qq"; + sha256 = "05pimdvigqv1ip4r4qg4i3irpzzfbx5h7hjc82cpvap337gdhsqj"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1411,10 +1428,10 @@ hashdiff = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.8"; }; hashie = { source = { @@ -1442,15 +1459,6 @@ }; version = "2.6.0"; }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; source = { @@ -1570,6 +1578,15 @@ }; version = "0.8.3"; }; + jaeger-client = { + dependencies = ["opentracing" "thrift"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + type = "gem"; + }; + version = "0.10.0"; + }; jira-ruby = { dependencies = ["activesupport" "multipart-post" "oauth"]; source = { @@ -1596,13 +1613,13 @@ version = "1.3.2"; }; js_regex = { - dependencies = ["regexp_parser"]; + dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnyd4c7lybhra3l6dai7j83lh3xapqjb340pp0h4bnqjgx52bkf"; + sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; type = "gem"; }; - version = "2.2.1"; + version = "3.1.1"; }; json = { source = { @@ -1676,10 +1693,10 @@ kgio = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118"; + sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; type = "gem"; }; - version = "2.10.0"; + version = "2.11.2"; }; knapsack = { dependencies = ["rake"]; @@ -1694,10 +1711,10 @@ dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s250z89nz7vzich3nikc8fs8vgpac38wjv8llm4ldvs4iyc4ypg"; + sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.2"; }; launchy = { dependencies = ["addressable"]; @@ -1856,10 +1873,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; minitest = { source = { @@ -1872,10 +1889,10 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864"; + sha256 = "0031gd2mjyba6jb7m97sqa149zjkr0vzn2s2gpb3m9nb67gqkm13"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.6"; }; multi_json = { source = { @@ -1986,10 +2003,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "09zll7c6j7xr6wyvh5mm5ncj6pkryp70ybcsxdbw1nyphx5dh184"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.1"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2196,6 +2213,22 @@ }; version = "2.2.3"; }; + opentracing = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xgwc46bd038zzqyasn5grqgk74v8vxmpdwivw2sp0fdldj1d9rf"; + type = "gem"; + }; + version = "0.4.3"; + }; + optimist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + type = "gem"; + }; + version = "3.0.0"; + }; org-ruby = { dependencies = ["rubypants"]; source = { @@ -2303,10 +2336,10 @@ pg = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32"; + sha256 = "1pnjw3rspdfjssxyf42jnbsdlgri8ylysimp0s28wxb93k6ff2qb"; type = "gem"; }; - version = "0.18.4"; + version = "1.1.3"; }; po_to_json = { dependencies = ["json"]; @@ -2428,6 +2461,14 @@ }; version = "0.0.3.3"; }; + raabro = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; + type = "gem"; + }; + version = "1.1.6"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -2475,10 +2516,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylx74ravz7nvnyygq0nk3v86qdzrmqxpwpayhppyy50l72rcajq"; + sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; rack-proxy = { dependencies = ["rack"]; @@ -2572,10 +2613,10 @@ raindrops = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0854mial50yhvdv0d2r41xxl47v7z2f4nx49js42hygv7rf1mscz"; + sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; rake = { source = { @@ -2612,13 +2653,13 @@ version = "0.3.6"; }; rbtrace = { - dependencies = ["ffi" "msgpack" "trollop"]; + dependencies = ["ffi" "msgpack" "optimist"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zj9xwazjp0g0fmhvc918irzcp2wyciwqzr0y199vc7r5qdr4sqv"; + sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; type = "gem"; }; - version = "0.4.10"; + version = "0.4.11"; }; rdoc = { source = { @@ -2653,14 +2694,6 @@ }; version = "1.1.0"; }; - redcarpet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; - type = "gem"; - }; - version = "3.4.0"; - }; RedCloth = { source = { remotes = ["https://rubygems.org"]; @@ -2734,10 +2767,18 @@ regexp_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1375q2v74cccjh290d9x28fdircvy18v6h0ww7a8i66qhh1jf2pb"; + sha256 = "18g5jyg3blsdrz3mc8d87bms6qqn6gcdh1nvdhvgbjdpk9pw21dq"; type = "gem"; }; - version = "0.5.0"; + version = "1.3.0"; + }; + regexp_property_values = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + type = "gem"; + }; + version = "0.3.4"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -3024,22 +3065,13 @@ }; version = "1.2.2"; }; - rufus-scheduler = { - dependencies = ["et-orbi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0343xrx4gbld5w2ydh9d2a7pw7lllvrsa691bgjq7p9g44ry1vq8"; - type = "gem"; - }; - version = "3.4.0"; - }; rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jv4nw9hvlxp8hhhlllrfcznki82i50fp1sj65zsjllfl2bvz8x6"; + sha256 = "0crasx5dmbr9ws89137n53l8nap7rdncp8yg5alw1jb99lqslhmi"; type = "gem"; }; - version = "0.27.5"; + version = "0.28.0"; }; safe_yaml = { source = { @@ -3174,22 +3206,22 @@ version = "3.1.2"; }; sidekiq = { - dependencies = ["connection_pool" "rack-protection" "redis"]; + dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyf9y3rvzizbwh68i2g1lzd40lalrdc4iyjmaa74gnfwsf92i26"; + sha256 = "1caiq5f5z5vzfria554n04pcbwc8zixf1fpavaksly9zywr3pc29"; type = "gem"; }; - version = "5.2.3"; + version = "5.2.5"; }; sidekiq-cron = { - dependencies = ["rufus-scheduler" "sidekiq"]; + dependencies = ["fugit" "sidekiq"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04mq83rzvq4wbc4h0rn00sawgv039j8s2p0wnlqb4sgf55gc0dzj"; + sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; type = "gem"; }; - version = "0.6.0"; + version = "1.0.4"; }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; @@ -3280,10 +3312,10 @@ sshkey = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; type = "gem"; }; - version = "1.9.0"; + version = "2.0.0"; }; stackprof = { source = { @@ -3385,6 +3417,14 @@ }; version = "0.3.6"; }; + thrift = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + type = "gem"; + }; + version = "0.11.0.0"; + }; tilt = { source = { remotes = ["https://rubygems.org"]; @@ -3427,22 +3467,14 @@ }; version = "1.0.0"; }; - trollop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rzx9rkacpq58dsvbbzs4cpybls1v1h36xskkfs5q2askpdr00wq"; - type = "gem"; - }; - version = "2.1.3"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4fhfi4p7ah9sshfhbk9j145s1ailbyj0dxnvqirs9kk10x2d1b"; + sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; type = "gem"; }; - version = "0.7.10"; + version = "0.7.11"; }; tzinfo = { dependencies = ["thread_safe"]; @@ -3507,10 +3539,10 @@ dependencies = ["kgio" "raindrops"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rcvg9381yw3wrnpny5c01mvm35caycshvfbg96wagjhscw6l72v"; + sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; type = "gem"; }; - version = "5.1.0"; + version = "5.4.1"; }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; @@ -3550,10 +3582,10 @@ version_sorter = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1smi0bf8pgx23014nkpfg29qnmlpgvwmn30q0ca7qrfbha2mjwdr"; + sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.4"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; @@ -3585,10 +3617,10 @@ dependencies = ["addressable" "crack" "hashdiff"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5"; + sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; type = "gem"; }; - version = "2.3.2"; + version = "3.5.1"; }; webpack-rails = { dependencies = ["railties"]; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index ad095ddbea51..aaa1737f99a1 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, scons, +{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gnome2, gtkmm2, scons, mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg, enca, pkgconfig, fetchpatch }: @@ -18,20 +18,20 @@ stdenv.mkDerivation rec { }; patches = map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} - {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} - {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} - {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} - {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} - {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} - {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} - {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} + {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} + {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} + {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} + {name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";} + {name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";} + {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} + {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} + {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} ]; nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; buildInputs = [ - gtk2 gnome2.gtkmm mjpegtools libdvdread dvdauthor boost dvdplusrwtools + gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools libxmlxx ffmpeg enca ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 24a1f07fb0d2..f7ecbc23a309 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -44,14 +44,14 @@ assert vdpauSupport -> libvdpau != null; let kodiReleaseDate = "20190129"; - kodiVersion = "18.0"; + kodiVersion = "18.1"; rel = "Leia"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - sha256 = "1ci5jjvqly01lysdp6j6jrnn49z4is9z5kan5zl3cpqm9w7rqarg"; + sha256 = "1w26aqvzxv4c70gcd1vw1pldapsc2xcacwq9b7dqx5m44j0zx1dc"; }; kodiDependency = { name, version, rev, sha256, ... } @attrs: @@ -70,8 +70,8 @@ let ffmpeg = kodiDependency rec { name = "FFmpeg"; version = "4.0.3"; - rev = "${version}-${rel}-RC5"; - sha256 = "0l20bysv2y711khwpnpw4dz6mzd37qllki3fnv4dx1lj8ivydrlx"; + rev = "${version}-${rel}-18.2"; + sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . ''; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 4bfd9e790070..2b21a25434d5 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv -, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU +, gnome3, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let fullPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc - gnome3.gtk + gtk3 gdk_pixbuf cairo libjpeg_original @@ -21,7 +21,7 @@ let lightworks = stdenv.mkDerivation rec { version = "14.0.0"; name = "lightworks-${version}"; - + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 3683973824a3..135dabd68981 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, - desktop-file-utils, enchant, gnome3, gst_all_1, hicolor-icon-theme, + desktop-file-utils, enchant, gnome3, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { buildInputs = [ desktop-file-utils enchant - gnome3.gtk - gnome3.gtkmm + gtk3 + gtkmm3 gst_all_1.gstreamer gst_all_1.gstreamermm gst_all_1.gst-plugins-base diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix index 8a0a62434ec0..14d997b2d5cf 100644 --- a/pkgs/build-support/rust/build-rust-crate/helpers.nix +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -14,9 +14,8 @@ include = includedFiles: src: builtins.filterSource (path: type: lib.lists.any (f: let p = toString (src + ("/" + f)); - suff = lib.strings.removePrefix p path; in - suff == "" || (lib.strings.hasPrefix "/" suff) + p == path || (lib.strings.hasPrefix (p + "/") path) ) includedFiles ) src; exclude = excludedFiles: src: builtins.filterSource (path: type: diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index b7b79f2e2ca1..2f583e2fc4b2 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchzip, lib }: let - version = "1.003"; + version = "1.008"; pname = "b612"; in fetchzip rec { name = "${pname}-font-${version}"; - url = "http://git.polarsys.org/c/${pname}/${pname}.git/snapshot/${pname}-bd14fde2544566e620eab106eb8d6f2b7fb1347e.zip"; - sha256 = "07gadk9b975k69pgw9gj54qx8d5xvxphid7wrmv4cna52jyy4464"; + url = "https://github.com/polarsys/b612/archive/${version}.zip"; + sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq"; postFetch = '' mkdir -p $out/share/fonts/truetype/${pname} unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname} diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index add2c44cd480..fabaa8d491c8 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ricty-${version}"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "http://www.rs.tus.ac.jp/yyusa/ricty/ricty_generator-${version}.sh"; - sha256 = "1cv0xh81fi6zdjb62zqjw46kbc89jvwbyllw1x1xbnpz2il6aavf"; + sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6"; }; unpackPhase = '' diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix new file mode 100755 index 000000000000..408bd9a92644 --- /dev/null +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "vazir-fonts"; + version = "19.2.0"; + + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + sha256 = "0p96y4q20nhpv7hxca6rncfcb14iqy2vacv0xl55wkwqkm4wvzgr"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/vazir-fonts + cp -v $( find . -name '*.ttf') $out/share/fonts/vazir-fonts + + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/rastikerdar/vazir-font; + description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linarcx ]; + }; +} diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index 78b6303188a2..28d68883d4b8 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf, +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, deepin }: @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.dconf - gnome3.gtk - gnome3.libgtop + gtk3 + libgtop gnome3.zenity bamf json-glib diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index be845d3c6bac..d2e29cd2cb8f 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg, +{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3, xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon, libstartup_notification, libinput, cogl, clutter, systemd, deepin }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk + gtk3 gnome3.gnome-desktop gnome3.gsettings-desktop-schemas gnome3.libgudev diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 1a01bd307eaa..c27e380470a3 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-nautilus" # Do not build nautilus plugin + "--enable-ps" "--enable-introspection" (if supportXPS then "--enable-xps" else "--disable-xps") ]; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 49a71987e754..0866fd104d23 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: stdenv.mkDerivation rec { - name = "lxrandr-0.3.1"; + name = "lxrandr-0.3.2"; src = fetchurl { url = "mirror://sourceforge/lxde/${name}.tar.xz"; - sha256 = "6d98338485a90d9e47f6d08184df77ca0d9715517f8a45a914e861750589184e"; + sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; configureFlags = stdenv.lib.optional withGtk3 "--enable-gtk3"; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 1989ac8e12cc..d6d189624f17 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 - gnome3.gtk + gtk3 mate.caja hicolor-icon-theme mate.mate-desktop diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 3b830f73c76a..22f100008aa8 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared-mime-info, gnome3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus-glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { librsvg libxml2 shared-mime-info - gnome3.gtk - gnome3.libpeas + gtk3 + libpeas mate.mate-desktop hicolor-icon-theme ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 975c80b1d0cf..8a707c78a510 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, gnome2, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "marco-${version}"; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { libcanberra-gtk3 libgtop gnome2.startup_notification - gnome3.gtk + gtk3 gnome3.zenity ]; - + meta = with stdenv.lib; { description = "MATE default window manager"; homepage = https://github.com/mate-desktop/marco; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index f9f0689fa65f..0a562b1f3cc7 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-applets-${version}"; @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtk - gnome3.gtksourceview + gtk3 + gtksourceview3 gnome3.gucharmap libwnck3 libgtop @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--enable-suid=no" ]; - + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 8697a150881b..d24198f5d7f4 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, gnome3, mate, hicolor-icon-theme, wrapGAppsHook + desktop-file-utils, gnome3, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 librsvg libappindicator-gtk3 - gnome3.gtk + gtk3 gnome3.dconf hicolor-icon-theme mate.mate-desktop diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index e6a43e6b457d..7d957e749b0b 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-desktop-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.dconf - gnome3.gtk + gtk3 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 643f67cd1e95..90b97cd2bfb4 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-media-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 libcanberra-gtk3 - gnome3.gtk + gtk3 mate.libmatemixer mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index e9f8b4b75b1f..91ed947c97cc 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libcanberra-gtk3, - libnotify, libwnck3, gnome3, mate, wrapGAppsHook }: + libnotify, libwnck3, gnome3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-notification-daemon-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 libnotify libwnck3 - gnome3.gtk + gtk3 ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index a7d34fc85a64..64b6b333f5a3 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus-glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libwnck3 librsvg libxml2 - gnome3.gtk + gtk3 gnome3.dconf mate.libmateweather mate.mate-desktop diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index a9c162e59122..88f497f21de9 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, libtool, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { itstool libxml2 libcanberra-gtk3 - gnome3.gtk + gtk3 gnome3.libgnome-keyring libnotify dbus-glib diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 480304fcb1c6..3c47e50b9c82 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,6 +1,5 @@ -{ config, stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier -, libcanberra-gtk3, libnotify, nss, polkit, gnome3, mate, wrapGAppsHook -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate, wrapGAppsHook +, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio }: stdenv.mkDerivation rec { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { libnotify nss polkit - gnome3.gtk + gtk3 gnome3.dconf mate.mate-desktop mate.libmatekbd diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index d71bb08dd5cb..b27804e50a55 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { name = "pluma-${version}"; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { enchant libxml2 python - gnome3.gtksourceview - gnome3.libpeas + gtksourceview3 + libpeas gnome3.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch index 438ed79d1bb0..1b2dc835706d 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/correct-override.patch @@ -1,7 +1,7 @@ -diff --git a/debian/elementary-default-settings.gsettings-override b/debian/elementary-default-settings.gsettings-override -index 6452c30..899972d 100644 ---- a/debian/elementary-default-settings.gsettings-override -+++ b/debian/elementary-default-settings.gsettings-override +diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override +index 1aef29c..08de164 100644 +--- a/overrides/default-settings.gschema.override ++++ b/overrides/default-settings.gschema.override @@ -1,5 +1,5 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index f133324a81ec..39299d2c2eb7 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "default-settings"; - version = "5.0"; + version = "5.1.0"; name = "elementary-${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0gyv835qbr90001gda2pzngzzbbk5jf9grgfl25pqkm29s45rqq0"; + sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym"; }; passthru = { @@ -21,16 +21,6 @@ stdenv.mkDerivation rec { }; patches = [ - # See: https://github.com/elementary/default-settings/pull/86 (didn't make 5.0 release) - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/05d0b2a4e98c28203521d599b40745b46be549fa.patch"; - sha256 = "1wk1qva3yzc28gljnkx9hb3pwhqnfrsb08wd76lsl3xnylg0wn2l"; - }) - # See: https://github.com/elementary/default-settings/pull/94 (didn't make 5.0 release) - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/a2ca00130c16e805179fb5abd7b624a873dff2da.patch"; - sha256 = "1jp1c5d8jfm0404zsylfk7h9vj81s409wgbzbsd2kxmz65icq16x"; - }) ./correct-override.patch ]; @@ -41,7 +31,7 @@ stdenv.mkDerivation rec { cp -av settings.ini $out/etc/gtk-3.0 mkdir -p $out/share/glib-2.0/schemas - cp -av debian/elementary-default-settings.gsettings-override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override + cp -av overrides/default-settings.gschema.override $out/share/glib-2.0/schemas/20-io.elementary.desktop.gschema.override mkdir $out/etc/wingpanel.d cp -avr ${./io.elementary.greeter.whitelist} $out/etc/wingpanel.d/io.elementary.greeter.whitelist diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index bd5688f941b2..466e7b6f22fb 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank +{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas , extraGSettingsOverrides ? "" , extraGSettingsOverridePackages ? [] }: @@ -6,10 +6,11 @@ let gsettingsOverridePackages = [ - gala - epiphany elementary-settings-daemon + epiphany + gala gnome3.mutter + gsettings-desktop-schemas gtk3 plank ] ++ extraGSettingsOverridePackages; @@ -32,8 +33,6 @@ runCommand "elementary-gsettings-desktop-schemas" {} cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] - draw-background=true - picture-options='zoom' picture-uri='${nixos-artwork.wallpapers.simple-dark-gray}/share/artwork/gnome/nix-wallpaper-simple-dark-gray.png' primary-color='#000000' diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index 6e3fe6c4ebf1..8e8b157aa229 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -72,6 +72,10 @@ let result = stdenv.mkDerivation rec { # Remove some broken manpages. rm -rf $out/man/ja* + # Remove embedded freetype to avoid problems like + # https://github.com/NixOS/nixpkgs/issues/57733 + rm $out/lib/libfreetype.so + # for backward compatibility ln -s $out $out/jre diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index ce3395f0be03..f5572c077f31 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -322,6 +322,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); + EXTRA_TARGET_FLAGS = optionals + (targetPlatform != hostPlatform && libcCross != null) + ([ + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" + ] ++ optionals (! crossStageStatic) [ + "-B${libcCross.out}${libcCross.libdir or "/lib"}" + ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 3e355dc302d6..a88cf9c01165 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -70,11 +70,9 @@ let ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc") 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; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 874580c87aab..da72c351ec66 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -72,11 +72,9 @@ let ++ 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; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 140cea22442e..f970836fd696 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -72,11 +72,9 @@ let ++ 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; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 7e670743f7fc..087d5a2c678d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages +{ stdenv, pkgsBuildTarget, targetPackages # build-tools , bootPkgs @@ -69,11 +69,9 @@ let ++ 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; + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix index a88e2c48d03e..52f3ad497ad6 100644 --- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix @@ -5,4 +5,5 @@ in self: super: { ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy]; ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; + system-fileio = doJailbreak super.system-fileio; } diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 06187987b6c6..068d7b578dfe 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -105,6 +105,5 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; - meta.broken = true; meta.hydraPlatforms = []; } diff --git a/pkgs/development/compilers/go/1.11.nix b/pkgs/development/compilers/go/1.11.nix index e65ad265a8b7..1e3a63983f4a 100644 --- a/pkgs/development/compilers/go/1.11.nix +++ b/pkgs/development/compilers/go/1.11.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell -, buildPackages, targetPackages }: +, buildPackages, pkgsTargetTarget +}: let @@ -150,16 +151,12 @@ stdenv.mkDerivation rec { # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}cc" + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" else null; - CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}c++" + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" else null; diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 0b8eb2dc19de..44304006f6b4 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation , mailcap, runtimeShell -, buildPackages, targetPackages }: +, buildPackages, pkgsTargetTarget +}: let @@ -155,16 +156,12 @@ stdenv.mkDerivation rec { # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}cc" + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" else null; - CXX_FOR_TARGET = if (stdenv.hostPlatform != stdenv.targetPlatform) then - "${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++" - else if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${stdenv.cc.targetPrefix}c++" + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" else null; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 767eafc456c0..749fbcc2fafb 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -2,14 +2,14 @@ cc ? stdenv.cc, lto ? !stdenv.isDarwin }: stdenv.mkDerivation ( rec { - name = "ponyc-${version}"; - version = "0.27.0"; + pname = "ponyc"; + version = "0.28.0"; src = fetchFromGitHub { owner = "ponylang"; - repo = "ponyc"; + repo = pname; rev = version; - sha256 = "11vdfvv9xirfi92y7zza9pqimfx33w74vw7rg5n7l60qqc8y2cla"; + sha256 = "011qxhiq75j6d37ws4nb6a8bdfw2cvlcsb2fgdkn1hx2xb81h6wc"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 298d8d581310..c439d2cca00d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -84,7 +84,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 = "1v2v6cwy957y5rgclb66ia7bl5j5mx291s3lh2swa39q3420m6v0"; + sha256 = "08gw3b5gbbxs2dr3b4zf9xsvhbvpqjj4ikmvzmcvs3fh1q65xbgl"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -1218,6 +1218,14 @@ self: super: { })]; }); + # Remove unecessary constraint: + # https://github.com/agrafix/superbuffer/pull/2 + superbuffer = overrideCabal super.superbuffer (drv: { + postPatch = '' + sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal + ''; + }); + # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. pandoc = doDistribute super.pandoc_2_7_1; 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 2d382e906325..5a856032e47c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -67,4 +67,25 @@ self: super: { # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485 stack = doJailbreak super.stack; + # Needs a recent version from the "develop" branch of the upstream git + # repository to compile with ghc 8.6.4. + liquid-fixpoint = assert super.liquid-fixpoint.version == "0.7.0.7"; overrideSrc super.liquid-fixpoint { + src = pkgs.fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquid-fixpoint"; + rev = "42c027ab9ae47907c588a2f1f9c05a5e0aa881e9"; + sha256 = "17qmzq1vx7h04yd38drr6sh6hys3q2rz62qh3pna9kbxlcnikkqf"; + }; + version = "0.8.0.2-pre-release"; + }; + liquidhaskell = assert super.liquidhaskell.version == "0.8.2.4"; overrideSrc super.liquidhaskell { + src = pkgs.fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquidhaskell"; + rev = "254e77da9cd36e95b72c526bfb9eec50d3447050"; + sha256 = "089x41z51iw542ijz32j9ns6flcc4hsbjqx7rfznvmm7a4q78yza"; + }; + version = "0.8.6.0-pre-release"; + }; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ff9934cd632c..911929db28b9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -46,7 +46,7 @@ default-package-overrides: # Newer versions don't work in LTS-12.x - alsa-mixer < 0.3 - cassava-megaparsec < 2 - # LTS Haskell 13.13 + # LTS Haskell 13.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -263,6 +263,7 @@ default-package-overrides: - bazel-runfiles ==0.7.0.1 - bbdb ==0.8 - bcrypt ==0.0.11 + - beam-core ==0.8.0.0 - bench ==1.0.12 - benchpress ==0.2.2.12 - bencode ==0.6.0.0 @@ -386,7 +387,7 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.11 + - checkers ==0.4.14 - checksum ==0.0 - choice ==0.2.2 - chronologique ==0.3.1.1 @@ -600,7 +601,7 @@ default-package-overrides: - direct-sqlite ==2.3.24 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - - distributed-closure ==0.4.1 + - distributed-closure ==0.4.1.1 - distribution-opensuse ==1.1.1 - distributive ==0.6 - dlist ==0.8.0.5 @@ -743,7 +744,7 @@ default-package-overrides: - fmt ==0.6.1.1 - fn ==0.3.0.2 - focus ==1.0.1.2 - - focuslist ==0.1.0.1 + - focuslist ==0.1.0.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.8 - fold-debounce-conduit ==0.2.0.3 @@ -1034,7 +1035,7 @@ default-package-overrides: - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 - http2 ==1.6.4 - - HTTP ==4000.3.12 + - HTTP ==4000.3.13 - http-api-data ==0.4 - http-client ==0.5.14 - http-client-tls ==0.3.5.3 @@ -1134,7 +1135,7 @@ default-package-overrides: - io-storage ==0.3 - io-streams ==1.5.1.0 - io-streams-haproxy ==1.0.1.0 - - ip ==1.4.2 + - ip ==1.4.2.1 - ip6addr ==1.0.0 - iproute ==1.7.7 - IPv6Addr ==1.1.2 @@ -1153,6 +1154,7 @@ default-package-overrides: - jack ==0.7.1.4 - jose ==0.8.0.0 - jose-jwt ==0.8.0 + - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - json ==0.9.3 @@ -1188,7 +1190,7 @@ default-package-overrides: - lame ==0.1.1 - language-c ==0.8.2 - language-c-quote ==0.12.2 - - language-docker ==8.0.1 + - language-docker ==8.0.2 - language-ecmascript ==0.19 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 @@ -1268,7 +1270,7 @@ default-package-overrides: - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - mainland-pretty ==0.7 - - main-tester ==0.2.0.0 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.6 - mapquest-api ==0.3.1 @@ -1294,7 +1296,7 @@ default-package-overrides: - mega-sdist ==0.3.3.2 - memory ==0.14.18 - MemoTrie ==0.6.9 - - menshen ==0.0.1 + - menshen ==0.0.2 - mercury-api ==0.1.0.2 - merkle-tree ==0.1.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1401,7 +1403,7 @@ default-package-overrides: - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.4 - netlib-ffi ==0.1.1 - - netpbm ==1.0.2 + - netpbm ==1.0.3 - netrc ==0.2.0.0 - nettle ==0.3.0 - netwire ==5.0.3 @@ -1840,7 +1842,7 @@ default-package-overrides: - siggy-chardust ==1.0.0 - signal ==0.1.0.4 - silently ==1.2.5 - - simple-cmd ==0.1.3 + - simple-cmd ==0.1.3.1 - simple-cmd-args ==0.1.0.1 - simple-log ==0.9.11 - simple-reflect ==0.3.3 @@ -2050,7 +2052,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-utilities ==0.2.1.0 - thyme ==0.3.5.5 - - tidal ==1.0.8 + - tidal ==1.0.10 - tile ==0.3.0.0 - time-compat ==0.1.0.3 - timeit ==2.0 @@ -2154,7 +2156,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - util ==0.1.12.0 + - util ==0.1.13.0 - utility-ht ==0.0.14 - uuid ==1.3.13 - uuid-types ==1.0.3 @@ -2231,7 +2233,7 @@ default-package-overrides: - webrtc-vad ==0.1.0.3 - websockets ==0.12.5.3 - websockets-snap ==0.10.3.0 - - weigh ==0.0.13 + - weigh ==0.0.14 - wide-word ==0.1.0.8 - wikicfp-scraper ==0.1.0.10 - wild-bind ==0.1.2.3 @@ -2304,7 +2306,7 @@ default-package-overrides: - yesod-auth-hashdb ==1.7.1 - yesod-auth-oauth2 ==0.6.1.1 - yesod-bin ==1.6.0.3 - - yesod-core ==1.6.12 + - yesod-core ==1.6.13 - yesod-csp ==0.2.4.0 - yesod-eventsource ==1.6.0 - yesod-fb ==0.5.0 @@ -2429,6 +2431,8 @@ package-maintainers: - lambdabot-core - lambdabot-irc-plugins - language-nix + - liquid-fixpoint + - liquidhaskell - logging-facade-syslog - nix-paths - pandoc @@ -6568,8 +6572,6 @@ broken-packages: - lio-simple - lipsum-gen - liquid - - liquid-fixpoint - - liquidhaskell - liquidhaskell-cabal - liquidhaskell-cabal-demo - list-fusion-probe @@ -8871,7 +8873,6 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles - - superbuffer - supercollider-ht - supercollider-midi - superconstraints diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 20968e540378..442db85c824a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9030,24 +9030,20 @@ self: { }) {}; "HTTP" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive, conduit - , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl - , network, network-uri, parsec, pureMD5, split, test-framework - , test-framework-hunit, time, wai, warp + ({ mkDerivation, array, base, bytestring, deepseq, httpd-shed + , HUnit, mtl, network, network-uri, parsec, pureMD5, split + , test-framework, test-framework-hunit, time }: mkDerivation { pname = "HTTP"; - version = "4000.3.12"; - sha256 = "140r6qy1ay25piv0z3hih11zhigyi08nkwc32097j43pjff6mzx3"; - revision = "2"; - editedCabalFile = "1gw6xzp1n4gsqwnbfr29ds8v4wpk78b2bha8i108dqav97viwm8c"; + version = "4000.3.13"; + sha256 = "0xb66msgr6d4vxr80a7wvwb0fwh20xfimdwakkg7x7qk4bdx6657"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; testHaskellDepends = [ - base bytestring case-insensitive conduit conduit-extra deepseq - http-types httpd-shed HUnit mtl network network-uri pureMD5 split - test-framework test-framework-hunit wai warp + base bytestring deepseq httpd-shed HUnit mtl network network-uri + pureMD5 split test-framework test-framework-hunit ]; description = "A library for client-side HTTP"; license = stdenv.lib.licenses.bsd3; @@ -10305,23 +10301,22 @@ self: { }) {}; "HsHTSLib" = callPackage - ({ mkDerivation, base, bytestring, bytestring-lexing, conduit - , containers, inline-c, mtl, tasty, tasty-golden, tasty-hunit - , template-haskell, vector, zlib + ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, conduit + , containers, tasty, tasty-golden, tasty-hunit, vector, zlib }: mkDerivation { pname = "HsHTSLib"; - version = "1.3.2.4"; - sha256 = "07zgbmk7511n0r7z7zdiryqxrxp000pq5wjdlhnr2ljahz53qnsq"; + version = "1.9.2"; + sha256 = "077j64jpq64bw9bjy0n2qmar6dc768lrn62cpkwl0cl5sygpd005"; libraryHaskellDepends = [ - base bytestring bytestring-lexing conduit containers inline-c mtl - template-haskell + base bytestring bytestring-lexing conduit containers ]; librarySystemDepends = [ zlib ]; + libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base bytestring conduit mtl tasty tasty-golden tasty-hunit vector + base bytestring conduit tasty tasty-golden tasty-hunit vector ]; - description = "High level bindings to htslib"; + description = "Bindings to htslib"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -13103,8 +13098,8 @@ self: { pname = "MonadRandom"; version = "0.5.1.1"; sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb"; - revision = "1"; - editedCabalFile = "14izcj2myfsvfwiy1w78q5zddxd6za77yy6b8zwb1x49lnw7jpck"; + revision = "2"; + editedCabalFile = "0l6a39vmqxig7jpr6snync4sli77wm6lwzypmmvx103d65p17k8k"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -15719,6 +15714,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_13" = callPackage + ({ mkDerivation, base, containers, deepseq, process, random + , splitmix, template-haskell, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.13"; + sha256 = "1k2iy1fzjp88ssnx4h05364zswky1nkhk051zr6nkyba8j18jx11"; + libraryHaskellDepends = [ + base containers deepseq random splitmix template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -22553,6 +22566,26 @@ self: { broken = true; }) {}; + "aern2-mp_0_1_4" = callPackage + ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens + , mixed-types-num, QuickCheck, regex-tdfa, rounded + , template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.1.4"; + sha256 = "1q4ygvpxndvj0lsxb7aqw754nkxj1r2037f263g79vpjczkzzfwf"; + libraryHaskellDepends = [ + base convertible hspec integer-logarithms lens mixed-types-num + QuickCheck regex-tdfa rounded template-haskell + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Multi-precision ball (interval) arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "aern2-real" = callPackage ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers , convertible, hspec, lens, mixed-types-num, QuickCheck, random @@ -22560,8 +22593,8 @@ self: { }: mkDerivation { pname = "aern2-real"; - version = "0.1.1.0"; - sha256 = "1sq2s20vwhm0avdzqg2vb5ck6rj7aw16kcfkdyhda0dl6s2l5q15"; + version = "0.1.2"; + sha256 = "1br2glj89xcm3iyb32yi1xwgzkva9mmvl9gih38kgg4ldidflvn8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -27433,8 +27466,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.4.0"; - sha256 = "1p02nf9i8v17f9nyx76306zdq4qlvqf6j86i88kfnjkpb8hfxl84"; + version = "0.3.6.0"; + sha256 = "0jv89pnap0ja39cmc2hri3npyz3sihc5xzdwargvrkavf4x1ij80"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28184,14 +28217,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-athena_6_4_0" = callPackage + "antiope-athena_7_0_0" = callPackage ({ mkDerivation, amazonka, amazonka-athena, amazonka-core, base , lens, resourcet, text, unliftio-core }: mkDerivation { pname = "antiope-athena"; - version = "6.4.0"; - sha256 = "0537hjh070l6z5wylbzr41qka3j75q2sbshqcmaazarzllsr5mxk"; + version = "7.0.0"; + sha256 = "0d5h0wqh8lndp34w42agsccv7yjma0dzr4n999g8mg9s95ygq7an"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -28200,6 +28233,7 @@ self: { amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28208,11 +28242,12 @@ self: { ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: mkDerivation { pname = "antiope-contract"; - version = "6.4.0"; - sha256 = "1l6a80plff3f9yd2iaw7hpqvas177xbkprz9maxk2xlf7klzpvcd"; + version = "7.0.0"; + sha256 = "19q8rzgxrvz326pmsr5vff7sbpryz1wy6sl2mm5vx2x3nr8jp7yb"; libraryHaskellDepends = [ aeson antiope-s3 avro base bytestring text ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -28240,25 +28275,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-core_6_4_0" = callPackage - ({ mkDerivation, amazonka, amazonka-core, base, bytestring - , exceptions, generic-lens, http-client, http-types, lens - , monad-logger, mtl, resourcet, text, transformers, unliftio-core + "antiope-core_7_0_0" = callPackage + ({ mkDerivation, aeson, aeson-lens, amazonka, amazonka-core, base + , bytestring, exceptions, generic-lens, hedgehog, hspec + , http-client, http-types, hw-hspec-hedgehog, lens, mtl, resourcet + , scientific, text, transformers, unliftio-core }: mkDerivation { pname = "antiope-core"; - version = "6.4.0"; - sha256 = "0snfalkpv9ckh3mkffx96zql3vnr479kkxxdyl2f2iad616a5wss"; + version = "7.0.0"; + sha256 = "0yhv5jda2llydrn6n9mvqgidhmfmz85xmwxyylc1ax5f3bpjvbdr"; libraryHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text + aeson amazonka amazonka-core base bytestring exceptions + generic-lens http-client http-types lens mtl resourcet text transformers unliftio-core ]; testHaskellDepends = [ - amazonka amazonka-core base bytestring exceptions generic-lens - http-client http-types lens monad-logger mtl resourcet text - transformers unliftio-core + aeson aeson-lens amazonka amazonka-core base bytestring exceptions + generic-lens hedgehog hspec http-client http-types + hw-hspec-hedgehog lens mtl resourcet scientific text transformers + unliftio-core ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28283,15 +28321,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-dynamodb_6_4_0" = callPackage + "antiope-dynamodb_7_0_0" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-dynamodb , antiope-core, base, generic-lens, lens, text, unliftio-core , unordered-containers }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.4.0"; - sha256 = "10kdvmfy7aya2yv77048mrkr9xdms5rq4gdip9ssidasib0fxcai"; + version = "7.0.0"; + sha256 = "0ikfxl8ysgkqiny8cxfvvh1j4mh7552147qj7k8m8wg6b29n332m"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -28300,6 +28338,7 @@ self: { amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28328,25 +28367,26 @@ self: { broken = true; }) {}; - "antiope-messages_6_4_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-s3, base, generic-lens, lens, lens-aeson - , monad-loops, network-uri, text, unliftio-core + "antiope-messages_7_0_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, base, bytestring + , generic-lens, hedgehog, hspec, hw-hspec-hedgehog, lens + , lens-aeson, monad-loops, network-uri, scientific, text + , unliftio-core }: mkDerivation { pname = "antiope-messages"; - version = "6.4.0"; - sha256 = "0m7sag2pk0sba1v14xpc60b7h5pk6s807yi0n5h6xrfsvslp09k9"; + version = "7.0.0"; + sha256 = "0z7qaywm37w73q472piszf4h2mfcv3ixrvrd7nvpyarjykjj19ma"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core + aeson amazonka amazonka-core base bytestring generic-lens lens + lens-aeson monad-loops network-uri text unliftio-core ]; testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 - base generic-lens lens lens-aeson monad-loops network-uri text - unliftio-core + aeson amazonka amazonka-core base bytestring generic-lens hedgehog + hspec hw-hspec-hedgehog lens lens-aeson monad-loops network-uri + scientific text unliftio-core ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -28379,29 +28419,30 @@ self: { broken = true; }) {}; - "antiope-s3_6_4_0" = callPackage + "antiope-s3_7_0_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , antiope-core, attoparsec, base, bytestring, conduit - , conduit-extra, exceptions, generic-lens, hedgehog, hspec - , http-types, hw-hspec-hedgehog, lens, monad-logger, mtl - , network-uri, resourcet, text, time, unliftio-core + , antiope-core, antiope-messages, attoparsec, base, bytestring + , conduit, conduit-extra, exceptions, generic-lens, hedgehog, hspec + , http-types, hw-hspec-hedgehog, lens, mtl, network-uri, resourcet + , text, time, unliftio-core }: mkDerivation { pname = "antiope-s3"; - version = "6.4.0"; - sha256 = "019j8n0rmv4cmkaa8lc69r02lrwbk267y99qbwy3fx2wqdicdij2"; + version = "7.0.0"; + sha256 = "0xz77pkjfg8v23ivg0b6idcm8rfrn6v5xyfi8hbdqjg1xq3li9ic"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec - base bytestring conduit conduit-extra exceptions generic-lens - http-types lens monad-logger mtl network-uri resourcet text time - unliftio-core + aeson amazonka amazonka-core amazonka-s3 antiope-core + antiope-messages attoparsec base bytestring conduit conduit-extra + exceptions generic-lens http-types lens mtl network-uri resourcet + text time unliftio-core ]; testHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 antiope-core attoparsec base bytestring conduit conduit-extra exceptions generic-lens - hedgehog hspec http-types hw-hspec-hedgehog lens monad-logger mtl - network-uri resourcet text time unliftio-core + hedgehog hspec http-types hw-hspec-hedgehog lens mtl network-uri + resourcet text time unliftio-core ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -28426,22 +28467,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "antiope-sns_6_4_0" = callPackage + "antiope-sns_7_0_0" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sns, base - , generic-lens, lens, text, time, unliftio-core + , bytestring, generic-lens, hedgehog, hspec, hw-hspec-hedgehog + , lens, text, time, unliftio-core }: mkDerivation { pname = "antiope-sns"; - version = "6.4.0"; - sha256 = "0ghr37p0k8pgch42cksfdinz7h7q7brvknj7flj1bgkh03j3gw03"; + version = "7.0.0"; + sha256 = "1hr35p9bxc3ah63ld1lyppnkx6yazs5ylnfcp036ai4ad42qx7lh"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text time unliftio-core + aeson amazonka amazonka-core amazonka-sns base bytestring + generic-lens lens text time unliftio-core ]; testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-sns base generic-lens lens - text time unliftio-core + aeson amazonka amazonka-core amazonka-sns base bytestring + generic-lens hedgehog hspec hw-hspec-hedgehog lens text time + unliftio-core ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28470,26 +28514,27 @@ self: { broken = true; }) {}; - "antiope-sqs_6_4_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 - , amazonka-sqs, antiope-messages, antiope-s3, base, conduit - , generic-lens, lens, lens-aeson, monad-loops, mtl, network-uri - , text, unliftio-core + "antiope-sqs_7_0_0" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-sqs, base + , bytestring, conduit, generic-lens, hedgehog, hspec + , hw-hspec-hedgehog, lens, lens-aeson, monad-loops, mtl + , network-uri, text, time, unliftio-core, unordered-containers }: mkDerivation { pname = "antiope-sqs"; - version = "6.4.0"; - sha256 = "067c29virlmi3lizhr9kmakr23ipc6sy2wwhg7wgf1wbmwcszs8j"; + version = "7.0.0"; + sha256 = "18hd7l6w0765rckqrvsk1kpxdvw6w708ink82di4l20w8wncxx07"; libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base conduit generic-lens lens - lens-aeson monad-loops mtl network-uri text unliftio-core + aeson amazonka amazonka-core amazonka-sqs base bytestring conduit + generic-lens lens lens-aeson monad-loops mtl network-uri text + unliftio-core unordered-containers ]; testHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 amazonka-sqs - antiope-messages antiope-s3 base conduit generic-lens lens - lens-aeson monad-loops mtl network-uri text unliftio-core + aeson amazonka amazonka-core amazonka-sqs base bytestring conduit + generic-lens hedgehog hspec hw-hspec-hedgehog lens lens-aeson + monad-loops mtl network-uri text time unliftio-core ]; + description = "Please see the README on Github at "; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -29520,6 +29565,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "approveapi" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, iso8601-time, katip, microlens, mtl, network + , QuickCheck, random, safe-exceptions, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "approveapi"; + version = "0.1.0.0"; + sha256 = "1qwsdcinq3xci5hqq1gs0bsm3kxaf61vw4csajv5nc8y4w48jzj6"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + deepseq exceptions http-api-data http-client http-client-tls + http-media http-types iso8601-time katip microlens mtl network + random safe-exceptions text time transformers unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec iso8601-time mtl QuickCheck + semigroups text time transformers unordered-containers vector + ]; + description = "ApproveAPI Haskell Client"; + license = stdenv.lib.licenses.mit; + }) {}; + "approx-rand-test" = callPackage ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit , containers, data-default, data-default-class, filepath, HUnit @@ -29644,17 +29716,17 @@ self: { "arbor-datadog" = callPackage ({ mkDerivation, aeson, auto-update, base, buffer-builder , bytestring, Cabal, dlist, generic-lens, hspec, lens, mtl, network - , random, resourcet, text, time, transformers, unordered-containers - , vector + , optparse-applicative, random, resourcet, text, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "arbor-datadog"; - version = "0.0.0.1"; - sha256 = "0lc3c2jnn2kmfyg7xgsnkgzkfir1ycn6qyq1z44501g360wrq0cv"; + version = "0.1.0.0"; + sha256 = "1w7bg8vj10mplfq39klhivj8hfb2cbgw9vhj1h64gm9v2xw25wlq"; libraryHaskellDepends = [ aeson auto-update base buffer-builder bytestring dlist generic-lens - lens mtl network random resourcet text time transformers - unordered-containers vector + lens mtl network optparse-applicative random resourcet text time + transformers unordered-containers vector ]; testHaskellDepends = [ base Cabal generic-lens hspec lens network resourcet time @@ -29700,16 +29772,16 @@ self: { "arbor-monad-logger" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hedgehog, hspec - , hw-hspec-hedgehog, monad-logger, mtl, text + , hw-hspec-hedgehog, monad-logger, mtl, optparse-applicative, text }: mkDerivation { pname = "arbor-monad-logger"; - version = "0.1.0.0"; - sha256 = "0m6gi36ckaq4v5mzpp6abcq93hyvvr0f7fdh4v87c4n044757agn"; + version = "0.1.1.1"; + sha256 = "13lgpr2j2vq2d4mbxl72h86iw5n028m5q0n2hbiz4hgk2yn2f2hs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring fast-logger monad-logger text + base bytestring fast-logger monad-logger optparse-applicative text ]; executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; @@ -29749,10 +29821,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric-datadog"; - version = "1.0.0"; - sha256 = "07hqghjrl25ky0rn4mnwia5b90zhf88w6zkqyscs527c0c6dkybc"; - revision = "2"; - editedCabalFile = "0x8dp7xh1rpd9db2kiya8sr9nc7wzka256jxsvxqfmphd08yc4ad"; + version = "1.1.0"; + sha256 = "1ly7vn630vm256jg1b6h39vzd7zv658h7j4vfv4jkdrrcl3jmbr0"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers @@ -30588,6 +30658,22 @@ self: { license = "LGPL"; }) {}; + "asap" = callPackage + ({ mkDerivation, base, bytestring, hedgehog, jwt, lens, mtl + , semigroups, text, time, uuid + }: + mkDerivation { + pname = "asap"; + version = "0.0.3"; + sha256 = "0pdr491497f8ndxd6blgjrfn5z102kswia9jn2p0q62zk911i0qm"; + libraryHaskellDepends = [ + base bytestring jwt lens mtl semigroups text time uuid + ]; + testHaskellDepends = [ base hedgehog jwt mtl text time ]; + description = "Atlassian Service Authentication Protocol"; + license = stdenv.lib.licenses.asl20; + }) {}; + "ascetic" = callPackage ({ mkDerivation, base, MissingH }: mkDerivation { @@ -30845,7 +30931,7 @@ self: { broken = true; }) {}; - "asif_4_1_0" = callPackage + "asif_5_0_0" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, conduit , conduit-combinators, conduit-extra, containers, cpu, directory , either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits @@ -30855,8 +30941,8 @@ self: { }: mkDerivation { pname = "asif"; - version = "4.1.0"; - sha256 = "1ys8cj08pj7z3yiks014z9jmvzkxnbh11khihzg57ig4z4w7bvp3"; + version = "5.0.0"; + sha256 = "1mz2wngsfk474lgmsw8zfg0znvgljhkcvgw8zqz48rnl1339zycp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31921,8 +32007,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.2.5.3"; - sha256 = "0imd4xikj15cb066713c38ik7a5r4dgdw95wgynjpi39clv4rmbz"; + version = "3.2.5.11"; + sha256 = "0x025agqc40184nxdjmmrh0qi7dxffr7a99fca3l1yik1002ssbn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -34089,8 +34175,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.68"; - sha256 = "13v843lma4yrlcsx60ils1j0h8q4aj6p09phqrfc0r1zc25a5ssv"; + version = "0.5.68.1"; + sha256 = "1q5bmnv78lzs3i9i0mcvp652rcrkipcccq6zypfic501d1hzq3ij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34782,6 +34868,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-orphans_0_8_1" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, hspec-discover, QuickCheck + }: + mkDerivation { + pname = "base-orphans"; + version = "0.8.1"; + sha256 = "1nwr9av27i9p72k0sn96mw3ywdczw65dy5gd5wxpabhhxlxdcas4"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Backwards-compatible orphan instances for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-prelude" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -35568,16 +35669,17 @@ self: { "beam-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free - , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty - , tasty-hunit, text, time, vector-sized + , ghc-prim, hashable, microlens, mtl, network-uri, scientific + , tagged, tasty, tasty-hunit, text, time, vector, vector-sized }: mkDerivation { pname = "beam-core"; - version = "0.7.2.3"; - sha256 = "1pas3hjj8x4yzwwqazydnvv59rjmddy70g6iip6fgm7sg4114rkh"; + version = "0.8.0.0"; + sha256 = "1l71xvmny0nf6fdhsffvfj764h4d97icgc291kfqz25n511b74r8"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable - microlens mtl network-uri tagged text time vector-sized + microlens mtl network-uri scientific tagged text time vector + vector-sized ]; testHaskellDepends = [ base bytestring tasty tasty-hunit text time @@ -35591,18 +35693,18 @@ self: { "beam-migrate" = callPackage ({ mkDerivation, aeson, base, beam-core, bytestring, containers , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable - , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text - , time, unordered-containers, uuid-types, vector + , haskell-src-exts, microlens, mtl, parallel, pqueue, pretty + , scientific, text, time, unordered-containers, uuid-types, vector }: mkDerivation { pname = "beam-migrate"; - version = "0.3.2.2"; - sha256 = "15vkxj93c3zhraj94v8n9sgkjlm6idawbzxqqgcx05yhy0dyh0c9"; + version = "0.4.0.0"; + sha256 = "0q60gkhfqgpwfcv24r4d2ikiq3m7wr3sx5q9cxf05b84g7ppz6s4"; libraryHaskellDepends = [ aeson base beam-core bytestring containers deepseq dependent-map - dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel - pqueue pretty scientific text time unordered-containers uuid-types - vector + dependent-sum free ghc-prim hashable haskell-src-exts microlens mtl + parallel pqueue pretty scientific text time unordered-containers + uuid-types vector ]; description = "SQL DDL support and migrations support library for Beam"; license = stdenv.lib.licenses.mit; @@ -35610,6 +35712,23 @@ self: { broken = true; }) {}; + "beam-mysql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, beam-core, bytestring + , case-insensitive, free, hashable, mtl, mysql, network-uri + , scientific, text, time + }: + mkDerivation { + pname = "beam-mysql"; + version = "0.2.0.0"; + sha256 = "14h0cfzzfbdh18impfvlz3ba3ycig5g7adv17h2ag1x6yyx5h259"; + libraryHaskellDepends = [ + aeson attoparsec base beam-core bytestring case-insensitive free + hashable mtl mysql network-uri scientific text time + ]; + description = "Connection layer between beam and MySQL/MariaDB"; + license = stdenv.lib.licenses.mit; + }) {}; + "beam-newtype-field" = callPackage ({ mkDerivation, base, beam-core, beam-migrate, lens , postgresql-simple @@ -35628,21 +35747,26 @@ self: { }) {}; "beam-postgres" = callPackage - ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring - , case-insensitive, conduit, free, hashable, haskell-src-exts - , lifted-base, monad-control, mtl, network-uri, postgresql-libpq - , postgresql-simple, scientific, tagged, text, time - , unordered-containers, uuid-types, vector + ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate + , bytestring, case-insensitive, conduit, directory, filepath, free + , hashable, haskell-src-exts, hedgehog, lifted-base, monad-control + , mtl, network-uri, postgresql-libpq, postgresql-simple, process + , scientific, tagged, tasty, tasty-hunit, temporary, text, time + , unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "beam-postgres"; - version = "0.3.2.3"; - sha256 = "17aplr20rclah3wk7b978zgn55fp61s8x7a5qf449nvfs97cs00b"; + version = "0.4.0.0"; + sha256 = "0dxnp6zsyy30vrlv15iw4qwyzwawg468zqqsjnzk9h3g9k9xzj3v"; libraryHaskellDepends = [ - aeson base beam-core beam-migrate bytestring case-insensitive - conduit free hashable haskell-src-exts lifted-base monad-control - mtl network-uri postgresql-libpq postgresql-simple scientific - tagged text time unordered-containers uuid-types vector + aeson attoparsec base beam-core beam-migrate bytestring + case-insensitive conduit free hashable haskell-src-exts lifted-base + monad-control mtl network-uri postgresql-libpq postgresql-simple + scientific tagged text time unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + base beam-core beam-migrate bytestring directory filepath hedgehog + postgresql-simple process tasty tasty-hunit temporary text uuid ]; description = "Connection layer between beam and postgres"; license = stdenv.lib.licenses.mit; @@ -35657,8 +35781,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.3.2.4"; - sha256 = "14s1s7i9l95nbz4nis3fc4zh8cln6vj2p4y5bk235l088i4z6qfj"; + version = "0.4.0.0"; + sha256 = "09va580nv05xavcrqw9drh86xgqgzl98bvh707xjn1d6wh3miizw"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable mtl network-uri scientific sqlite-simple text time unix @@ -38140,30 +38264,30 @@ self: { }) {}; "bioinformatics-toolkit" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , bytestring-lexing, case-insensitive, clustering, conduit - , conduit-combinators, containers, criterion, data-default-class - , data-ordlist, double-conversion, hexpat, HsHTSLib, http-conduit - , IntervalMap, lens, math-functions, matrices, mtl, parallel - , primitive, random, split, statistics, tasty, tasty-golden - , tasty-hunit, text, transformers, unordered-containers, vector - , vector-algorithms, word8 + , conduit-combinators, conduit-extra, containers, criterion + , data-default-class, data-ordlist, double-conversion, hexpat + , HsHTSLib, http-conduit, IntervalMap, lens, math-functions + , matrices, mtl, parallel, primitive, random, split, statistics + , tasty, tasty-golden, tasty-hunit, text, transformers + , unordered-containers, vector, vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.5.1"; - sha256 = "1lpcbzapinfbd7s4hz2yj3nwp1hm4fy514hqnqil4ijndyknlk3n"; + version = "0.6.0"; + sha256 = "1w6c8gi8vss8wz94hwv5vap2ss6qzm7la9p9dxplcw7yz3q5c47w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-lexing - case-insensitive clustering conduit containers data-default-class - data-ordlist double-conversion hexpat HsHTSLib http-conduit - IntervalMap lens math-functions matrices mtl parallel primitive - split statistics text transformers unordered-containers vector - vector-algorithms word8 + aeson aeson-pretty attoparsec base bytestring bytestring-lexing + case-insensitive clustering conduit conduit-extra containers + data-default-class data-ordlist double-conversion hexpat HsHTSLib + http-conduit IntervalMap lens math-functions matrices mtl parallel + primitive split statistics text transformers unordered-containers + vector vector-algorithms word8 ]; testHaskellDepends = [ - base bytestring conduit conduit-combinators data-default-class + base bytestring conduit conduit-combinators data-default-class lens matrices mtl random tasty tasty-golden tasty-hunit unordered-containers vector ]; @@ -38313,17 +38437,18 @@ self: { }) {}; "bisc" = callPackage - ({ mkDerivation, base, directory, filepath, selda, selda-sqlite - , text, xdg-basedir + ({ mkDerivation, base, configurator, directory, filepath, mtl + , selda, selda-sqlite, text, xdg-basedir }: mkDerivation { pname = "bisc"; - version = "0.1.0.0"; - sha256 = "16gjnqjp1rhsi59nxhx24zxwabzk75wiz97163pd657j02a5mwl0"; + version = "0.2.0.0"; + sha256 = "07fgilmgkz95ar8gc1dvxq65xd82hvqr7y54550f1i55d2h3q95j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory filepath selda selda-sqlite text xdg-basedir + base configurator directory filepath mtl selda selda-sqlite text + xdg-basedir ]; description = "A small tool that clears qutebrowser cookies"; license = stdenv.lib.licenses.gpl3; @@ -41181,8 +41306,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.46"; - sha256 = "1alfv1z0adp74d7vcqp92c73y8rkhv96s3lj4dqjxkqk044zgd9p"; + version = "0.47"; + sha256 = "1glj71qajc2rdn9akhhh0yryhps57s33x0i2fb4mf12zg8pp5kj7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42510,18 +42635,18 @@ self: { "bv-sized" = callPackage ({ mkDerivation, base, containers, lens, mtl, parameterized-utils - , prettyclass, QuickCheck, random + , pretty, QuickCheck, random }: mkDerivation { pname = "bv-sized"; - version = "0.5.0"; - sha256 = "08q4hg2kil8ahqpz0pmyxxnij3n3xhlfp5dr3ri3imgc1b2sn1m6"; + version = "0.6.0"; + sha256 = "0bhci00l4946z3b6ynzpi3k17bnawir88kqpp36jai8filb0znc5"; libraryHaskellDepends = [ - base containers lens mtl parameterized-utils prettyclass QuickCheck + base containers lens mtl parameterized-utils pretty QuickCheck random ]; testHaskellDepends = [ - base lens parameterized-utils prettyclass QuickCheck random + base lens parameterized-utils pretty QuickCheck random ]; description = "a BitVector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; @@ -43790,8 +43915,8 @@ self: { pname = "cabal-install"; version = "2.4.1.0"; sha256 = "1b91rcs00wr5mf55c6xl8hrxmymlq72w71qm5r0q4j869asv5g39"; - revision = "1"; - editedCabalFile = "0bm11hd3s07s1vsxdbkn5bgm5fz5bh1xdg91yz1fzr9d3b3ypa8p"; + revision = "2"; + editedCabalFile = "18llmvfaf8gcz2dvhhs3j0a6kzzisajh1bms7wwnrl0hi4xyx012"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; @@ -45423,8 +45548,8 @@ self: { }: mkDerivation { pname = "capability"; - version = "0.1.0.0"; - sha256 = "1aif560z65hmq0pyf6b30nj73685r85vgq440pmzgfhidbn4lf51"; + version = "0.2.0.0"; + sha256 = "0jssnbqrhkkfkjzya8qprk89r8vqzzy45sm9bwhw2rwx8mrbn40q"; libraryHaskellDepends = [ base dlist exceptions generic-lens lens monad-control monad-unlift mtl mutable-containers primitive safe-exceptions streaming @@ -47959,8 +48084,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.4.11"; - sha256 = "0f1dhiymdihrnpz9h9p4mi8iica07qv3wm47acvdkhxrc4sjsq6h"; + version = "0.4.14"; + sha256 = "0pnb7xdhaq4rw28hd4cz1b04w52ffjghw3x9zchiwm4h8hwhvibz"; libraryHaskellDepends = [ array base QuickCheck random semigroupoids ]; @@ -47968,6 +48093,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_5_0" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.5.0"; + sha256 = "1kbn71blf67jfncv4gia8ygyzh4bngq36vapq2vqrqrzhap3mqi7"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -48936,6 +49075,34 @@ self: { broken = true; }) {}; + "circuit-breaker" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances + , random, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "circuit-breaker"; + version = "0.1.0.0"; + sha256 = "1yg6d0676z94070rwqzf13bpg1qzqyh5wk38yqcp7w1aib304mw7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base mtl random text time transformers unliftio unliftio-core + unordered-containers + ]; + executableHaskellDepends = [ + base mtl random text time transformers unliftio unliftio-core + unordered-containers + ]; + testHaskellDepends = [ + base mtl QuickCheck quickcheck-instances random tasty tasty-hunit + tasty-quickcheck text time transformers unliftio unliftio-core + unordered-containers + ]; + description = "An implementation of the \"circuit breaker\" pattern to disable repeated calls to a failing system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cirru-parser" = callPackage ({ mkDerivation, aeson, base, text, vector }: mkDerivation { @@ -49269,8 +49436,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.3"; - sha256 = "1x7mw4qw5mfkv6nhqaxp9pgry7xdsb3x24fvkpb7c2iigv1yyk8n"; + version = "0.2.0.4"; + sha256 = "13c03zj15xx8hq6gqvq62dfqz936mrrz34irk7bqyi0sbhqgrjn1"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal inline-c process ]; @@ -53697,6 +53864,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "concurrency_1_7_0_0" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.7.0.0"; + sha256 = "16zg4c2x2ym7crvrimzp8jr3mw6qlbdzkfmv1h6smjp3bn8qxf06"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrency-benchmarks" = callPackage ({ mkDerivation, async, base, bench-graph, bytestring, Chart , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics @@ -55105,8 +55289,8 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.2.2"; - sha256 = "1zr6c9wdlx16v559zzjah84v0psphyzyq5d837ncshkxmssri8ja"; + version = "0.4.2.3"; + sha256 = "165ay133dxr0midy8yhsnsw5pf1lqh6pg4x63gjip945hfjl0lwq"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -55659,8 +55843,8 @@ self: { ({ mkDerivation, base, deepseq, primitive }: mkDerivation { pname = "contiguous"; - version = "0.3.2.0"; - sha256 = "0mgsha615rzaki7cn6w78ihrni3s9hza23srmxy9rpvybvh6xql7"; + version = "0.3.3.0"; + sha256 = "0hpglbbydyi46rw0jybb87g4wsc5qp4vnswijznav90j8sl34lhc"; libraryHaskellDepends = [ base deepseq primitive ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; @@ -58865,15 +59049,15 @@ self: { "cryptostore" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, basement , bytestring, cryptonite, hourglass, memory, pem, tasty - , tasty-hunit, tasty-quickcheck, x509 + , tasty-hunit, tasty-quickcheck, x509, x509-validation }: mkDerivation { pname = "cryptostore"; - version = "0.1.0.0"; - sha256 = "1pq53k0dx0akwp1rkgadyb256w0lds8iq7yn2xb217nyjyghyrqz"; + version = "0.2.0.0"; + sha256 = "1j7pk42mivwlcrjyrjdkldidhsv3k5myqq0ld8sksgkbkn1k1z7w"; libraryHaskellDepends = [ asn1-encoding asn1-types base basement bytestring cryptonite - hourglass memory pem x509 + hourglass memory pem x509 x509-validation ]; testHaskellDepends = [ asn1-types base bytestring cryptonite hourglass memory pem tasty @@ -64219,14 +64403,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_2_0_0_1" = callPackage + "dejafu_2_1_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, contravariant , deepseq, exceptions, leancheck, profunctors, random, transformers }: mkDerivation { pname = "dejafu"; - version = "2.0.0.1"; - sha256 = "0hdw4y81inxq4ivkfb4b7sj68ysb8n9czfyhifmhkqfaddg5inzg"; + version = "2.1.0.0"; + sha256 = "19jvcfkwavmvf08dwsch3izk9qzw8ldrghpvjgv2vh5dxr7wr9xq"; libraryHaskellDepends = [ base concurrency containers contravariant deepseq exceptions leancheck profunctors random transformers @@ -64719,14 +64903,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "deque_0_4_0_2" = callPackage + "deque_0_4_2" = callPackage ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances , rerebase, strict-list, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "deque"; - version = "0.4.0.2"; - sha256 = "01ipk4dw8lgc5r3d224va9imli8wa5i8dknk7xzfv64pmm6gh6wa"; + version = "0.4.2"; + sha256 = "0zqz8akmkrkwcfkqmspr5dbk5dzhlsh7raxfvda40xhiwyni1cpf"; libraryHaskellDepends = [ base mtl strict-list ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -66988,8 +67172,8 @@ self: { pname = "dimensional"; version = "1.3"; sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9"; - revision = "1"; - editedCabalFile = "1p6bn0xcxapm9r9b692l6kkijw0r41p1naiyx523pi5r0njs33k1"; + revision = "2"; + editedCabalFile = "10xkgwjb9kqa95jck3b9wa3sz6vcb2lkygfmcqqz6hz6j65l79r8"; libraryHaskellDepends = [ base deepseq exact-pi ieee754 numtype-dk semigroups vector ]; @@ -67625,17 +67809,19 @@ self: { }) {}; "disjoint-containers" = callPackage - ({ mkDerivation, aeson, base, containers, doctest, QuickCheck - , quickcheck-classes, semigroups, transformers + ({ mkDerivation, aeson, base, containers, doctest, enum-types + , QuickCheck, quickcheck-classes, quickcheck-enum-instances + , semigroups, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "disjoint-containers"; - version = "0.2.3"; - sha256 = "0a6y1m0jq3lxj5vwgn4j4ij8xgkrkxb4nr7n3ba98sv8iaf1q8gw"; + version = "0.2.4"; + sha256 = "0x64x327842da1a3bhbkrc88za300f3c2wd9fyci3qqm0mv7fdjk"; libraryHaskellDepends = [ aeson base containers transformers ]; testHaskellDepends = [ - aeson base containers doctest QuickCheck quickcheck-classes - semigroups + aeson base containers doctest enum-types QuickCheck + quickcheck-classes quickcheck-enum-instances semigroups tasty + tasty-quickcheck ]; description = "Disjoint containers"; license = stdenv.lib.licenses.bsd3; @@ -67803,8 +67989,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.4.1"; - sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny"; + version = "0.4.1.1"; + sha256 = "0w3n13a0rdi6cw5h3sivrfnr96qizd2hk0gma7b9c7hdh0sxw89r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69393,12 +69579,16 @@ self: { }) {}; "dom-lt" = callPackage - ({ mkDerivation, array, base, containers }: + ({ mkDerivation, array, base, containers, criterion, deepseq }: mkDerivation { pname = "dom-lt"; - version = "0.1.3"; - sha256 = "0i51d8d49jpf7mhl6c2a4565d4vmh0x5f4kam46hn5ahb1v2nrga"; + version = "0.2.0"; + sha256 = "15jf1csnqwd56izw5zk6kbp2kk6y0zkgm9ddbwrk0k3ngmdqzkli"; + revision = "1"; + editedCabalFile = "1rkjm9ssi7j2klf11b8w1wlw3hg4ybcfxdi2klik6lm5mpb52x7w"; libraryHaskellDepends = [ array base containers ]; + testHaskellDepends = [ base containers ]; + benchmarkHaskellDepends = [ base containers criterion deepseq ]; description = "The Lengauer-Tarjan graph dominators algorithm"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71466,8 +71656,8 @@ self: { ({ mkDerivation, base, dimensions, easytensor, vulkan-api }: mkDerivation { pname = "easytensor-vulkan"; - version = "1.0.0.0"; - sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3"; + version = "1.0.1.0"; + sha256 = "1mbykmlba5wlf66apiy2l2120fkj3wjhijj8b67plgpqrcw1kpp9"; libraryHaskellDepends = [ base dimensions easytensor vulkan-api ]; description = "Use easytensor with vulkan-api"; license = stdenv.lib.licenses.bsd3; @@ -72782,8 +72972,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.5.0"; - sha256 = "1laa86kkw2w4bz2z69fnp1vwyjnhz2w2zy6va93fgvxmn0cf7mj3"; + version = "0.5.1"; + sha256 = "0d9544s892rhy0dkhzz6w3nryhbl26yahs4k1nkpgdqsxsnv4rvn"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -73352,26 +73542,28 @@ self: { }) {}; "email-validator" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, dns, doctest + ({ mkDerivation, base, bytestring, cmdargs, dns, doctest , email-validate, HUnit, parallel-io, pcre-light, tasty , tasty-hunit }: mkDerivation { pname = "email-validator"; - version = "0.0.3"; - sha256 = "0ai0fj7rpq9h0i0rznrsqwvqbkkry5dgq4hgg5jc8ma3j9gym87n"; + version = "1.0.0"; + sha256 = "0l8c87kv80y1cpifcg80zhmdi884n7409w22akvc7kb9vvyp3b4v"; + revision = "1"; + editedCabalFile = "08ncdqjmgxlzsxfj8z0xaj1p5nnx4ndj4490gvfhj50kv2wx47iw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cmdargs directory dns email-validate HUnit - parallel-io pcre-light tasty tasty-hunit + base bytestring cmdargs dns email-validate HUnit parallel-io + pcre-light tasty tasty-hunit ]; testHaskellDepends = [ - base bytestring cmdargs directory dns doctest email-validate HUnit + base bytestring cmdargs dns doctest email-validate HUnit parallel-io pcre-light tasty tasty-hunit ]; description = "Perform basic syntax and deliverability checks on email addresses"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -77541,8 +77733,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "failable"; - version = "1.2.0.0"; - sha256 = "0iihl34739aq8y1fbgimyksjlaqf3ggw7q13zihd1bsa7jy255y9"; + version = "1.2.0.1"; + sha256 = "18lb0g4fi02mffhi61wd4rfcfx2ilrbrpl5wkyianw5mixjqlxms"; libraryHaskellDepends = [ base mtl transformers ]; description = "A 'Failable' error monad class to unify failure across monads that can fail"; license = stdenv.lib.licenses.bsd3; @@ -80348,8 +80540,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "2.1.0"; - sha256 = "1qi877cpfkp7lzdjwq2q6gqqkbvby63z6r22f3ydkx5362ins6kh"; + version = "2.2.0"; + sha256 = "0nwl9gxaxjdvgr0ji7r0hh9z43s473rb69dgb3p8ab3kdc3mld11"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80499,8 +80691,8 @@ self: { ({ mkDerivation, async, base, clock, time }: mkDerivation { pname = "fixed-timestep"; - version = "0.1.0.0"; - sha256 = "1zhqh6y4j5v8vwf417jjgix5z1z67zrxgdpcrsyk4i8pi69892hv"; + version = "0.2.0.1"; + sha256 = "0rk5ym38m48khss38v8x09sdfz2nyhw7bw3dbjzy5qad09nzsipl"; libraryHaskellDepends = [ async base clock time ]; description = "Pure Haskell library to repeat an action at a specific frequency"; license = stdenv.lib.licenses.mit; @@ -81892,10 +82084,8 @@ self: { }: mkDerivation { pname = "focuslist"; - version = "0.1.0.1"; - sha256 = "1qq5ixaxrwy2wn8xz8ckva9m50bkygj2gpw89fdry4wglvkrmvpx"; - revision = "2"; - editedCabalFile = "12x38kxhcjdqfwl8y8zdrwcpv6jdm7jaqc48ww3hg6fpv8rvvd49"; + version = "0.1.0.2"; + sha256 = "06s8655l7nzpmwf6z8p11g9mngb9a0kw10riii67sq8jcanpllkq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -86309,10 +86499,8 @@ self: { }: mkDerivation { pname = "generic-aeson"; - version = "0.2.0.9"; - sha256 = "1jw4rmfsky8r8551ddjy0i3va3dj37flzf23gxniyam7zy8kzh9l"; - revision = "4"; - editedCabalFile = "0m2m2wfv9nhq8m7xl1nrmj4wy3yip3s31b4448za58ryrwkdgjzd"; + version = "0.2.0.10"; + sha256 = "0dz7kib81234xmp7lzwww4vfnbpkq1pdalzvxxxqcjj31l0i803c"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -86711,6 +86899,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generics-mrsop_2_0_0" = callPackage + ({ mkDerivation, base, containers, mtl, template-haskell }: + mkDerivation { + pname = "generics-mrsop"; + version = "2.0.0"; + sha256 = "1cdjh5bjvx8xfglwnm48lfybdz4n8v7v8va2c3zyihzqbxh6akml"; + libraryHaskellDepends = [ base containers mtl template-haskell ]; + description = "Generic Programming with Mutually Recursive Sums of Products"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core , template-haskell @@ -88812,6 +89012,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_3_1" = callPackage + ({ mkDerivation, base, ghc, hspec, hspec-discover, text }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.3.1"; + sha256 = "1r45954nchn5rink3qrdv6pqigwsm1a2fyb297b56kpgz47cfgd7"; + 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 { @@ -90600,8 +90815,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20190219"; - sha256 = "0161jszid9nih31q55zh8dldyfz5q0v4m2gw9dbb2hb1x47w3ww2"; + version = "7.20190322"; + sha256 = "1ylz38zp9dz6fyavjz88lzlv5bd9d2mic08ac5vsnxixqbj8rnnx"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -92442,8 +92657,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.6.2"; - sha256 = "063y0q6iz4s5hqjc4cpd2y49w9zq6w3lcnvxlv73miysb9q16a4b"; + version = "0.6.3"; + sha256 = "12lvq3lc52ggflcb8m6j8xxxi4p5mspfwbc4fxb34h1076gxhdd1"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -92468,8 +92683,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.6.2"; - sha256 = "0z6il1ff3cgzk0bvgp2c1lp7qn4ws0nd2asm1x15cb8498iyqlaa"; + version = "0.6.3"; + sha256 = "06bjmhnm2g9vmxjrw661ips3c6160xbw1qj4527radif51lskf6i"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -92494,8 +92709,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.6.2"; - sha256 = "10a2ma35mk3plwcsn80ccc879ajz0ifyl8xqifn0kfz3dpk7g0y7"; + version = "0.6.3"; + sha256 = "1z93jflgnj5ja17gpa8ab0i8lvm2x4vcqbmil3zca2djnbg61257"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -92519,8 +92734,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.6.2"; - sha256 = "182ky7k17wfc0cijyhib8j0ajw963yrbq9y91lsvvd7vnjfwds1x"; + version = "0.6.3"; + sha256 = "0pczlmny8brmr24v6zfdkarx4sy530j4454p9agswrc7s37fhf5n"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -99526,8 +99741,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "4"; - editedCabalFile = "1mkk6vkq681rgq159rgr73vlkch0z5cj3vbmz0n6540y8i3zs3mp"; + revision = "5"; + editedCabalFile = "07mzv3bwb4rcwlmsd9c36g71y605qh72li0rsxf3c1k5bpcnl3yi"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -100080,8 +100295,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.16.1"; - sha256 = "1g71s2bzj9w97nd3pjyk8ldi4kd5j4pnxy9rmvnwz645zl998fny"; + version = "1.16.2"; + sha256 = "1icycnpvp9xc4v02z7sbjjv3g9cx82kssxc0aqzylvskmc1aw1jy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103813,8 +104028,8 @@ self: { }: mkDerivation { pname = "haskell-dap"; - version = "0.0.12.0"; - sha256 = "0n1abvz7a03d3xgkykkk2ggm74lsh1kg0jv0z1k9874pncxx4li4"; + version = "0.0.13.0"; + sha256 = "1hyy1jx5b7k3rhk3xmr4nsx2ay7jgq70nxy01a7ap1y4gzy9pjns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -109401,16 +109616,14 @@ self: { "hedgehog-classes" = callPackage ({ mkDerivation, aeson, base, containers, hedgehog, pretty-show - , transformers, wl-pprint-annotated + , semirings, transformers, wl-pprint-annotated }: mkDerivation { pname = "hedgehog-classes"; - version = "0.1.1.0"; - sha256 = "1fi4n7g6daf9a8dzc876830jqdlc6pl5nyb9q7q9rffiv43sbmv2"; - revision = "2"; - editedCabalFile = "0m1ajqbg5k9k7xmgq5xm7s6l3lckr634bfsnbm9ydkr0cgs8rwcc"; + version = "0.1.2"; + sha256 = "0lvlsv7mgmys03v4xnjvfb19426xa1vwfnrbpf0yg8h0pv6hz7wv"; libraryHaskellDepends = [ - aeson base containers hedgehog pretty-show transformers + aeson base containers hedgehog pretty-show semirings transformers wl-pprint-annotated ]; testHaskellDepends = [ aeson base containers hedgehog ]; @@ -111226,7 +111439,7 @@ self: { libraryToolDepends = [ CoreServices ]; description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; + platforms = [ "x86_64-darwin" ]; }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; @@ -113300,10 +113513,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.14.1"; - sha256 = "139iqa7kpnn2r9r3awbpmhbgn7nvybppmx648fjk6hgsivggjpay"; - revision = "1"; - editedCabalFile = "1ivk3hdzhlb5xdkmiqvbnhj7hjfv7kx4h70q14xrxp0wl8jpiqvd"; + version = "1.14.2"; + sha256 = "1si9zqparkdq77yji87lhcsrf11fr3gisqwsv82cabhrhc36x6l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113481,8 +113692,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.14"; - sha256 = "0nj8qrqkvmxmq0sqhq1z5i3zfivb7glsnv37g9k5ag6vcr48r7i8"; + version = "1.14.1"; + sha256 = "1w6qp01cak6spnpldm01czlm6i5a2alw47w76875l2nagrc4rfp2"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec cmdargs containers @@ -113513,8 +113724,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.14"; - sha256 = "1pnzbc4myyqlz4rc1lm1acyynvkhxwdd82fl2rrwc31phj1b46jk"; + version = "1.14.2"; + sha256 = "0bhixvzxv7d0kwb4ppv3sc98wjkc58kna9f91202s63sbikahlcr"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -113559,8 +113770,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.14"; - sha256 = "15ajph5cmc1a44lqw42020pb4znkrpgx3wk5dl26pbynilm5247b"; + version = "1.14.1"; + sha256 = "0w59nr7mj0nx8z44cvhy1rhlj5rmx0wq4p5nfl4dycfmp7jwvsm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113917,8 +114128,10 @@ self: { ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { pname = "hmatrix-banded"; - version = "0.0.0.2"; - sha256 = "0civscp7bqqcdfnz33ypg86ly98d42f1jhyz3fyi667g9rfq4fyb"; + version = "0.0.0.3"; + sha256 = "1vmvgxvyllqgp7cb2yrfqir99gcxn50s7gc9117g2fq8m3dqq34f"; + revision = "1"; + editedCabalFile = "0q58d297a555xb9mrpri9p30wyr5jmi46afixrh3hlvldddkw663"; libraryHaskellDepends = [ base hmatrix transformers ]; librarySystemDepends = [ liblapack ]; description = "HMatrix interface to LAPACK functions for banded matrices"; @@ -114508,58 +114721,62 @@ self: { }) {inherit (pkgs) netcdf;}; "hnix" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, array, base - , base16-bytestring, binary, bytestring, containers, criterion - , cryptohash-md5, cryptohash-sha1, cryptohash-sha256 - , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff - , directory, exceptions, filepath, generic-random, Glob, hashable - , hashing, haskeline, hedgehog, hspec-discover, http-client + ({ mkDerivation, aeson, array, base, base16-bytestring, binary + , bytestring, comonad, containers, criterion, cryptohash-md5 + , cryptohash-sha1, cryptohash-sha256, cryptohash-sha512, data-fix + , deepseq, dependent-sum, deriving-compat, Diff, directory + , exceptions, filepath, free, generic-random, Glob, hashable + , hashing, haskeline, hedgehog, hnix-store-core, http-client , http-client-tls, http-types, interpolate, lens-family - , lens-family-core, lens-family-th, logict, megaparsec, monadlist - , mtl, optparse-applicative, pretty-show, process, regex-tdfa - , regex-tdfa-text, repline, scientific, semigroups, serialise - , split, syb, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , tasty-th, template-haskell, text, these, time, transformers, unix - , unordered-containers, vector, xml + , lens-family-core, lens-family-th, logict, megaparsec + , monad-control, monadlist, mtl, optparse-applicative + , parser-combinators, pretty-show, prettyprinter, process, ref-tf + , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups + , serialise, split, syb, tasty, tasty-hedgehog, tasty-hunit + , tasty-quickcheck, tasty-th, template-haskell, text, these, time + , transformers, transformers-base, unix, unordered-containers + , vector, xml }: mkDerivation { pname = "hnix"; - version = "0.5.2"; - sha256 = "059l2zqbqi5826qq1dq00vl7f1kfyr0wrs9imsx36yfbr9ac9wqk"; + version = "0.6.0"; + sha256 = "1yirs9q2hm7h8zahc053q129s5iab6c24745hin4hik0ghdqw6k7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint array base base16-bytestring binary bytestring + aeson array base base16-bytestring binary bytestring comonad containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 - cryptohash-sha512 data-fix deepseq deriving-compat directory - exceptions filepath hashable hashing haskeline http-client - http-client-tls http-types interpolate lens-family lens-family-core - lens-family-th logict megaparsec monadlist mtl optparse-applicative - pretty-show process regex-tdfa regex-tdfa-text scientific - semigroups serialise split syb template-haskell text these time - transformers unix unordered-containers vector xml + cryptohash-sha512 data-fix deepseq dependent-sum deriving-compat + directory exceptions filepath free hashable hashing haskeline + hnix-store-core http-client http-client-tls http-types interpolate + lens-family lens-family-core lens-family-th logict megaparsec + monad-control monadlist mtl optparse-applicative parser-combinators + pretty-show prettyprinter process ref-tf regex-tdfa regex-tdfa-text + scientific semigroups serialise split syb template-haskell text + these time transformers transformers-base unix unordered-containers + vector xml ]; executableHaskellDepends = [ - aeson ansi-wl-pprint base base16-bytestring bytestring containers + aeson base base16-bytestring bytestring comonad containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix deepseq exceptions filepath hashing haskeline mtl - optparse-applicative pretty-show repline serialise template-haskell - text time transformers unordered-containers + optparse-applicative pretty-show prettyprinter ref-tf repline + serialise template-haskell text time transformers + unordered-containers ]; testHaskellDepends = [ - ansi-wl-pprint base base16-bytestring bytestring containers - cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 - data-fix deepseq Diff directory exceptions filepath generic-random - Glob hashing hedgehog interpolate megaparsec mtl - optparse-applicative pretty-show process serialise split tasty - tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + base base16-bytestring bytestring containers cryptohash-md5 + cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 data-fix + deepseq dependent-sum Diff directory exceptions filepath + generic-random Glob hashing hedgehog interpolate megaparsec mtl + optparse-applicative pretty-show prettyprinter process serialise + split tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th template-haskell text time transformers unix unordered-containers ]; - testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - ansi-wl-pprint base base16-bytestring bytestring containers - criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256 - cryptohash-sha512 data-fix deepseq exceptions filepath hashing mtl + base base16-bytestring bytestring containers criterion + cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 + data-fix deepseq exceptions filepath hashing mtl optparse-applicative serialise template-haskell text time transformers unordered-containers ]; @@ -114569,6 +114786,56 @@ self: { broken = true; }) {}; + "hnix-store-core" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring, binary + , bytestring, containers, cryptohash-md5, cryptohash-sha1 + , cryptohash-sha256, directory, filepath, hashable, mtl, process + , regex-base, regex-tdfa-text, tasty, tasty-discover, tasty-hspec + , tasty-hunit, tasty-quickcheck, temporary, text, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "hnix-store-core"; + version = "0.1.0.0"; + sha256 = "1xrx3ly6qsh3j6naqxdv9v759fbmksd2yfdgnzppcnskrcfrm347"; + libraryHaskellDepends = [ + base base16-bytestring binary bytestring containers cryptohash-md5 + cryptohash-sha1 cryptohash-sha256 directory filepath hashable mtl + regex-base regex-tdfa-text text unix unordered-containers vector + ]; + testHaskellDepends = [ + base base64-bytestring binary bytestring containers directory + process tasty tasty-discover tasty-hspec tasty-hunit + tasty-quickcheck temporary text + ]; + testToolDepends = [ tasty-discover ]; + description = "Core effects for interacting with the Nix store"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "hnix-store-remote" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring + , containers, hnix-store-core, mtl, network, pretty-simple, text + , unix, unordered-containers + }: + mkDerivation { + pname = "hnix-store-remote"; + version = "0.1.0.0"; + sha256 = "04dmql5235z05hq36wnbgc3sk0izqryv7n8dh8r3dq2j87zvv3y8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring containers hnix-store-core + mtl network text unix unordered-containers + ]; + executableHaskellDepends = [ + base bytestring hnix-store-core mtl pretty-simple + unordered-containers + ]; + description = "Remote hnix store"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hnn" = callPackage ({ mkDerivation, base, binary, bytestring, hmatrix, mwc-random , random, vector, vector-binary-instances, zlib @@ -118092,6 +118359,8 @@ self: { pname = "hsaml2"; version = "0.1"; sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck"; + revision = "1"; + editedCabalFile = "0xvyzq2y94za0ggrlcxvpz4g29jxdcjp3ga8f77hr0f4hfz4z10l"; libraryHaskellDepends = [ asn1-encoding asn1-types base base64-bytestring bytestring cryptonite data-default http-types hxt hxt-charproperties @@ -123375,6 +123644,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "httpd-shed_0_4_1_0" = callPackage + ({ mkDerivation, base, network, network-bsd, network-uri }: + mkDerivation { + pname = "httpd-shed"; + version = "0.4.1.0"; + sha256 = "11am9hnqw13chgzvl3b7v72gjklv2jxgps7dqk4acsl0z7jqip7y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base network network-bsd network-uri ]; + description = "A simple web-server with an interact style API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "https-everywhere-rules" = callPackage ({ mkDerivation, attoparsec, base, errors, functor-infix, hspec , http-client, https-everywhere-rules-raw, lens, network, pipes @@ -123761,12 +124044,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_2_0_0_0" = callPackage + "hunit-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "2.0.0.0"; - sha256 = "0j48wg6nq90hgl3jfdiy020az5m8vcpbnfvxcpjci3vzd24c4gx9"; + version = "2.0.0.1"; + sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; @@ -124469,6 +124752,27 @@ self: { broken = true; }) {}; + "hw-ip_2_3_0_0" = callPackage + ({ mkDerivation, appar, base, containers, generic-lens, hedgehog + , hspec, hw-bits, hw-hspec-hedgehog, iproute, text + }: + mkDerivation { + pname = "hw-ip"; + version = "2.3.0.0"; + sha256 = "1i5k74gagcijykvdfjy8c97a3bkbab51q7y4hmhvqkx7gsn3lsl5"; + libraryHaskellDepends = [ + appar base containers generic-lens hw-bits iproute text + ]; + testHaskellDepends = [ + appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog + text + ]; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hw-json" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, containers, criterion, directory, dlist, hspec @@ -130368,8 +130672,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "1.4.2"; - sha256 = "0r1ipv6mcbxpzwkfhr6hm2srr01wr5np20axgvqvplaskai9cj87"; + version = "1.4.2.1"; + sha256 = "0661bygbgd2j897hbzs2pgqdk12px2d904r13lfw7bcrp892xja1"; libraryHaskellDepends = [ aeson attoparsec base bytestring deepseq hashable primitive text vector @@ -130389,6 +130693,36 @@ self: { broken = true; }) {}; + "ip_1_5_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, hspec, hspec-discover, HUnit + , primitive, QuickCheck, quickcheck-classes, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector + , wide-word + }: + mkDerivation { + pname = "ip"; + version = "1.5.0"; + sha256 = "128kqqjbn020lpmga17dp34v91jbnnn8q2b1gy9rw21wvy507f5j"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring deepseq hashable primitive text + vector wide-word + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text wide-word + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -132173,17 +132507,14 @@ self: { }) {}; "japanese-holidays" = callPackage - ({ mkDerivation, base, doctest, hspec, QuickCheck - , quickcheck-instances, time - }: + ({ mkDerivation, base, doctest, hspec, hspec-discover, time }: mkDerivation { pname = "japanese-holidays"; - version = "0.1.1.0"; - sha256 = "1xcamcv6n6k2pmbhxy9dbzff94cr2ijf2ykvyrc3s2idk6jhd2bh"; + version = "0.2.0.0"; + sha256 = "13v8ibbz0sb7rw8y8v1dnyfpc3mc83x63dijnrl45xglwmi2qnjk"; libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ - base doctest hspec QuickCheck quickcheck-instances time - ]; + testHaskellDepends = [ base doctest hspec time ]; + testToolDepends = [ hspec-discover ]; description = "Japanese holidays utility"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134455,10 +134786,10 @@ self: { }: mkDerivation { pname = "jwt"; - version = "0.9.0"; - sha256 = "1glkaahp3jq744s61y0ja5fdggwac9p1dwia4c19k1ld6qhd5395"; + version = "0.10.0"; + sha256 = "1a1fqmqfm2ajq75mq2x6la8jb2g5hzl4dk8cgx9xsrikp8c7n75w"; revision = "1"; - editedCabalFile = "1vpd4pq8mh4dha7i2pfv4iqpw411yachzkf7p9rnfyicipj53pw2"; + editedCabalFile = "0agwck6lidcxlixk5jgw0pw162xrsnlsgj8y8jwlyhjpqfq52ifi"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite http-types memory network-uri scientific semigroups text time unordered-containers @@ -137973,8 +138304,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "8.0.1"; - sha256 = "0wmnwsf2avdygd3mnz9bd53hlmasgh6cbmzxir2b2ycnp21a1ily"; + version = "8.0.2"; + sha256 = "00fgxddlim1h7xcklr1q38sxbf8zh1m84mha6yzab5as1x14lhij"; libraryHaskellDepends = [ base bytestring containers free megaparsec mtl prettyprinter split template-haskell text th-lift time @@ -140891,13 +141222,18 @@ self: { }) {}; "libarchive" = callPackage - ({ mkDerivation, base, bytestring, filepath, libarchive }: + ({ mkDerivation, base, bytestring, c2hs, composition-prelude + , filepath, libarchive + }: mkDerivation { pname = "libarchive"; - version = "0.2.1.2"; - sha256 = "1fwiwfqknndfnq55psdbj2swf1y5cm971lah4dgayg8vn76n961x"; - libraryHaskellDepends = [ base bytestring filepath ]; + version = "1.0.3.0"; + sha256 = "1ps6wnp5bzlq0ma9d3c5xr1dh2sxn8sx3lg66jx7pqv2s4xnjm41"; + libraryHaskellDepends = [ + base bytestring composition-prelude filepath + ]; libraryPkgconfigDepends = [ libarchive ]; + libraryToolDepends = [ c2hs ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libarchive;}; @@ -141398,46 +141734,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "libraft_0_4_1_0" = callPackage + "libraft_0_5_0_0" = callPackage ({ mkDerivation, async, atomic-write, attoparsec, base , base16-bytestring, bytestring, cereal, concurrency, containers - , cryptohash-sha256, dejafu, directory, exceptions, file-embed - , haskeline, hunit-dejafu, lifted-base, monad-control, mtl, network - , network-simple, parsec, postgresql-simple, process, protolude - , QuickCheck, quickcheck-state-machine, random, repline, stm, tasty - , tasty-dejafu, tasty-discover, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, text, time, transformers, transformers-base - , tree-diff, word8 + , cryptohash-sha256, dejafu, directory, ekg, ekg-core, exceptions + , file-embed, filepath, haskeline, lifted-base, monad-control + , monad-metrics, mtl, network, network-simple, optparse-applicative + , parsec, postgresql-simple, postgresql-simple-url, process + , protolude, QuickCheck, quickcheck-state-machine, random, repline + , stm, tasty, tasty-dejafu, tasty-discover, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-base, tree-diff, unordered-containers, word8 }: mkDerivation { pname = "libraft"; - version = "0.4.1.0"; - sha256 = "03f76ysn1r8nvxzd21lrnhg1dy1fikq0jwbjz0x6z4w8q8vik38i"; + version = "0.5.0.0"; + sha256 = "13wk2dk0hs3ds5sa301v35i4g7frq1d7nj6c2957cbd9xwwyrksc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async atomic-write attoparsec base base16-bytestring bytestring cereal concurrency containers cryptohash-sha256 dejafu directory - exceptions file-embed haskeline lifted-base monad-control mtl - network network-simple parsec postgresql-simple protolude random - repline stm text time transformers transformers-base word8 + ekg ekg-core exceptions file-embed filepath haskeline lifted-base + monad-control monad-metrics mtl network network-simple parsec + postgresql-simple protolude random repline stm text time + transformers transformers-base unordered-containers word8 ]; executableHaskellDepends = [ async atomic-write attoparsec base base16-bytestring bytestring cereal concurrency containers cryptohash-sha256 dejafu directory - exceptions file-embed haskeline lifted-base monad-control mtl - network network-simple parsec postgresql-simple protolude random - repline stm text time transformers transformers-base word8 + ekg ekg-core exceptions file-embed filepath haskeline lifted-base + monad-control monad-metrics mtl network network-simple + optparse-applicative parsec postgresql-simple postgresql-simple-url + protolude random repline stm text time transformers + transformers-base unordered-containers word8 ]; testHaskellDepends = [ async atomic-write attoparsec base base16-bytestring bytestring cereal concurrency containers cryptohash-sha256 dejafu directory - exceptions file-embed haskeline hunit-dejafu lifted-base - monad-control mtl network network-simple parsec postgresql-simple - process protolude QuickCheck quickcheck-state-machine random - repline stm tasty tasty-dejafu tasty-discover - tasty-expected-failure tasty-hunit tasty-quickcheck text time - transformers transformers-base tree-diff word8 + ekg ekg-core exceptions file-embed filepath haskeline lifted-base + monad-control monad-metrics mtl network network-simple parsec + postgresql-simple process protolude QuickCheck + quickcheck-state-machine random repline stm tasty tasty-dejafu + tasty-discover tasty-expected-failure tasty-hunit tasty-quickcheck + text time transformers transformers-base tree-diff + unordered-containers word8 ]; testToolDepends = [ tasty-discover ]; description = "Raft consensus algorithm"; @@ -143101,8 +143442,6 @@ self: { doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -143145,8 +143484,6 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -147208,8 +147545,8 @@ self: { }: mkDerivation { pname = "main-tester"; - version = "0.2.0.0"; - sha256 = "0iqb7p90hsygpscyddpvrxdaxka8hdc5xk3acacfns0didc7icnc"; + version = "0.2.0.1"; + sha256 = "0hkqllckiq74mhnd76jd0cv5az6n0cf70xncy9r1jkip9s9za1ng"; libraryHaskellDepends = [ base bytestring directory ]; testHaskellDepends = [ base bytestring hspec hspec-core QuickCheck text @@ -148532,6 +148869,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-io_0_1_6_0" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq, directory + , filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.6.0"; + sha256 = "0ggl24w7y9bhlf0dh379raiq8fi2gb29whypp3jy37h8m6ldsngn"; + libraryHaskellDepends = [ + base bytestring data-default deepseq directory filepath JuicyPixels + massiv netpbm process vector + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "massiv-scheduler" = callPackage + ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest + , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell + , unliftio-core + }: + mkDerivation { + pname = "massiv-scheduler"; + version = "0.1.0.0"; + sha256 = "0yqcpcaff6hx8pn39bh88s5g9nryc4qyr3765wbqbh02fbrjpxkq"; + revision = "1"; + editedCabalFile = "1mlbhm8scqlpkqjlc34wmpinvx2lpihhi8jkn99plhxh1s37ai8j"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest hspec QuickCheck template-haskell + ]; + description = "Work stealing scheduler for Massiv (Массив) and other parallel applications"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -148806,20 +149182,21 @@ self: { "matplotlib" = callPackage ({ mkDerivation, ad, aeson, base, bytestring, containers, deepseq - , filepath, process, random, raw-strings-qq, split, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit, temporary + , directory, filepath, process, random, raw-strings-qq, split + , tasty, tasty-expected-failure, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "matplotlib"; - version = "0.6.0"; - sha256 = "105rqbqpqgnsgqxvzqgp203bp4bckf35z7cncqg7nwypgf10ipvd"; + version = "0.7.4"; + sha256 = "0vpvi0iigmajz3dn0kx5kk9i7ccpbxs1f9fg4qymy3v18zd3wiqg"; libraryHaskellDepends = [ aeson base bytestring containers deepseq filepath process split temporary ]; testHaskellDepends = [ - ad base bytestring process random raw-strings-qq split tasty - tasty-expected-failure tasty-golden tasty-hunit temporary + ad base bytestring directory process random raw-strings-qq split + tasty tasty-expected-failure tasty-golden tasty-hunit temporary ]; description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; @@ -150316,8 +150693,8 @@ self: { }: mkDerivation { pname = "menshen"; - version = "0.0.1"; - sha256 = "1i4h5s3d57466hzyp7mag1z7dbp306qm2sf4k3a0frpsz2n2ijsw"; + version = "0.0.2"; + sha256 = "05z6vmxgxfsl4s5bsxrkd929mfml0yk51gwinhwv9c090f5yvbli"; libraryHaskellDepends = [ base regex-tdfa scientific text ]; testHaskellDepends = [ aeson base hspec QuickCheck regex-tdfa scientific text @@ -158179,6 +158556,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "named_0_3_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "named"; + version = "0.3.0.0"; + sha256 = "03pg2xdx86c7ns8p04gn8l4nwpjx538545f0fjq0j3mlhn09qrh7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Named parameters (keyword arguments) for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "named-formlet" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, mtl , text, transformers @@ -159479,10 +159869,8 @@ self: { }: mkDerivation { pname = "netpbm"; - version = "1.0.2"; - sha256 = "1my2zi26wspzh0pplfhgwj9vmkv41hwvrzl8k1virqsbm6y08sl4"; - revision = "1"; - editedCabalFile = "1vhwjv5c5gxn9l9982da54nzczbmj8rl09xn8ac7rix0zmmyvl50"; + version = "1.0.3"; + sha256 = "17cxh15wf7m9ljg0scd5i71ki95fiz8qhrfk4w1zvk4pf2gb7z38"; libraryHaskellDepends = [ attoparsec attoparsec-binary base bytestring storable-record unordered-containers vector vector-th-unbox @@ -159936,6 +160324,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; + revision = "1"; + editedCabalFile = "0j5dpk1b5qx2rl8w9awrw5ghi8i7fm7zhkdhakcqaqrx8m1yraar"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database () API"; license = stdenv.lib.licenses.bsd3; @@ -160725,12 +161115,12 @@ self: { }) {}; "network-uri-lenses" = callPackage - ({ mkDerivation, base, lens, network-uri }: + ({ mkDerivation, base, network-uri }: mkDerivation { pname = "network-uri-lenses"; - version = "0.2.0.0"; - sha256 = "08yvcvpqwibxpqjz3qbkvks1aqgbshdc9chnj8b49yd1vdrzx41p"; - libraryHaskellDepends = [ base lens network-uri ]; + version = "0.2.1.0"; + sha256 = "1z4qqdr2b64pf5xx73bqgjrlqnvi0x6ziqqbzc7x1ka736cdak2w"; + libraryHaskellDepends = [ base network-uri ]; description = "Lenses for network-uri"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -160897,6 +161287,37 @@ self: { broken = true; }) {inherit (pkgs) blas;}; + "newhope" = callPackage + ({ mkDerivation, AES, base, bytestring, containers, deepseq, hspec + , HUnit, mtl, parallel, QuickCheck, raw-strings-qq, statistics + , system-fileio, system-filepath, tasty, tasty-expected-failure + , tasty-hunit, tasty-quickcheck, text, trifecta, vector + }: + mkDerivation { + pname = "newhope"; + version = "0.1.0.0"; + sha256 = "1yqxdir74mdi2dkccl1wcr2xzxrvg6y8ssskdq0laxb3q8xyzpwa"; + revision = "1"; + editedCabalFile = "18508knx0m46k9wpcxdvb1kahg5vrqc734ifwam9q5kljpm9l0sy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + AES base bytestring containers deepseq mtl vector + ]; + executableHaskellDepends = [ + AES base bytestring containers deepseq mtl system-fileio + system-filepath tasty-quickcheck text vector + ]; + testHaskellDepends = [ + AES base bytestring containers deepseq hspec HUnit mtl parallel + QuickCheck raw-strings-qq statistics system-fileio system-filepath + tasty tasty-expected-failure tasty-hunit tasty-quickcheck text + trifecta vector + ]; + description = "Library implementing the NewHope cryptographic key-exchange protocol"; + license = stdenv.lib.licenses.asl20; + }) {}; + "newports" = callPackage ({ mkDerivation, base, directory, old-time }: mkDerivation { @@ -163582,8 +164003,8 @@ self: { }: mkDerivation { pname = "ocaml-export"; - version = "0.9.0.0"; - sha256 = "1wqgvaf8198p1avq3vlmi256a6wk5w76m4hvlhvmdv0kzad3iw25"; + version = "0.13.0"; + sha256 = "1pfy648qrx7s0qmli9cjs0c0bnnvirilicaydy08zj3w4rvjfdb4"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec hspec-golden-aeson mtl QuickCheck @@ -165957,8 +166378,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.1.1"; - sha256 = "0m86imawwvr0bl18bbv9np8hlhs8ssn4l2dvxswa8f83fm61ai5a"; + version = "0.2.1"; + sha256 = "1ycmlwyyflxd2bmrxqydkznqpz98sbs3c84zsszdmwn2dgyjgm01"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -166068,21 +166489,22 @@ self: { ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, boxes , bytestring, colour, containers, data-default, diagrams-lib , diagrams-svg, directory, exceptions, filepath, fmt, formatting - , hashable, hspec, HUnit, lens, linear, mtl, optparse-simple - , orgmode-parse, QuickCheck, quickcheck-text, text, time - , transformers, turtle, universum, yaml + , hashable, hspec, HUnit, lens, mtl, optparse-simple, orgmode-parse + , process, QuickCheck, quickcheck-text, text, time, transformers + , turtle, universum, yaml }: mkDerivation { pname = "orgstat"; - version = "0.1.5"; - sha256 = "00zkn7d45q9wbbpkygkz8fslals6z5d90hvg1jgna4vw87zqwkdz"; + version = "0.1.6"; + sha256 = "1w6nbgq29bdx0skqsy7h46x46g6rzpsgp2n5ldxv2nmbwbhq6bib"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base boxes bytestring colour containers data-default diagrams-lib diagrams-svg directory - exceptions filepath fmt formatting hashable lens linear mtl - optparse-simple orgmode-parse text time turtle universum yaml + exceptions filepath fmt formatting hashable lens mtl + optparse-simple orgmode-parse process text time turtle universum + yaml ]; executableHaskellDepends = [ base bytestring directory exceptions filepath formatting @@ -169541,6 +169963,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pattern-matcher" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck }: + mkDerivation { + pname = "pattern-matcher"; + version = "0.1.0.0"; + sha256 = "03adnzwcpc2mqqvfd2akiln0pfq6fn451an8vwxgx9gff0y85x5q"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers mtl QuickCheck ]; + description = "A library for compiling pattern-matching to decision trees"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pattern-trie" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , doctest, hashable, mtl, QuickCheck, tasty, tasty-quickcheck, text @@ -171325,18 +171759,19 @@ self: { }) {}; "persistent-relational-record" = callPackage - ({ mkDerivation, base, conduit, containers, hlint, HUnit, mtl - , persistable-record, persistent, persistent-template - , relational-query, resourcet, template-haskell, test-framework - , test-framework-hunit, test-framework-th, text, time + ({ mkDerivation, array, base, conduit, containers, hlint, HUnit + , mtl, names-th, persistable-record, persistent + , persistent-template, relational-query, resourcet + , template-haskell, test-framework, test-framework-hunit + , test-framework-th, text, time }: mkDerivation { pname = "persistent-relational-record"; - version = "0.1.2.0"; - sha256 = "1xbrkf7vw872hxk6g7bv4c5hx0708x6sqf38a4qm0m9bf2qiakgd"; + version = "0.3.0"; + sha256 = "0cbm9klj9z7lrkp8b9s3z6ij1apbmjxqmxaakmykz1fqc483h9g1"; libraryHaskellDepends = [ - base conduit containers mtl persistable-record persistent - relational-query resourcet template-haskell text + array base conduit containers mtl names-th persistable-record + persistent relational-query resourcet template-haskell text ]; testHaskellDepends = [ base hlint HUnit persistent-template relational-query @@ -178372,8 +178807,8 @@ self: { }: mkDerivation { pname = "primitive-containers"; - version = "0.3.1"; - sha256 = "0ikpnci6lk6nmalyr5kkqwrr12kpclr8ka001hlz0mcy8rrxncq3"; + version = "0.3.3"; + sha256 = "12qcgh20w3dk08gz2fwi69q2gqygiadsnvcgjvv2gqspncdwqxza"; libraryHaskellDepends = [ aeson base contiguous deepseq hashable primitive primitive-sort quantification text unordered-containers vector @@ -180823,22 +181258,26 @@ self: { }) {}; "publish" = callPackage - ({ mkDerivation, base, bytestring, chronologique, directory - , filepath, hinotify, pandoc, pandoc-types, template-haskell, text - , typed-process, unbeliever, unix, unordered-containers + ({ mkDerivation, base, bytestring, chronologique, deepseq + , directory, filepath, hinotify, hspec, pandoc, pandoc-types + , template-haskell, text, typed-process, unbeliever, unix + , unordered-containers }: mkDerivation { pname = "publish"; - version = "0.3.2"; - sha256 = "1jkmp5wsd8ffrxvj965z9pch5g8vxkfwv70hxa3lipdh46k6ll7l"; - revision = "1"; - editedCabalFile = "136hi1c3ap2dvhn79dqdn29dfq5ncilg6qap41d0wf4jp7p419a8"; + version = "0.4.4"; + sha256 = "1a75pqz9gvzda70182gvfwjjzsrqdspngj00mlma1ayr9jy4sxr4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring chronologique directory filepath hinotify pandoc - pandoc-types template-haskell text typed-process unbeliever unix - unordered-containers + base bytestring chronologique deepseq directory filepath hinotify + pandoc pandoc-types template-haskell text typed-process unbeliever + unix unordered-containers + ]; + testHaskellDepends = [ + base bytestring chronologique deepseq directory filepath hinotify + hspec pandoc pandoc-types template-haskell text typed-process + unbeliever unix unordered-containers ]; description = "Publishing tools for papers, books, and presentations"; license = stdenv.lib.licenses.bsd3; @@ -182852,6 +183291,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_20" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, splitmix, tagged, text, time, transformers + , transformers-compat, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.20"; + sha256 = "1f5mr70hgzg0ys8x6fkhdlh7bvvy4c1p4z23s4qzc6r9jvd11vya"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific splitmix tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -183177,8 +183641,8 @@ self: { ({ mkDerivation, base, QuickCheck, template-haskell }: mkDerivation { pname = "quickcheck-with-counterexamples"; - version = "1.1"; - sha256 = "13vnr98g9cds2jbg76z528lji5mfcxghwjj4sry0011wlrwrx1fd"; + version = "1.2"; + sha256 = "0shigzw0r59cwa22f56522qfv0lsaq1z2861lgy1lhhclzswr6zg"; libraryHaskellDepends = [ base QuickCheck template-haskell ]; description = "Get counterexamples from QuickCheck as Haskell values"; license = stdenv.lib.licenses.bsd3; @@ -183603,8 +184067,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.2.0"; - sha256 = "0841p4yw0hd1mjx0ida662n6apfhmjyw76ar9gaysivbgh75dw4y"; + version = "0.2.1"; + sha256 = "17wbnagrikmhkn4pgbwsj9n3k37xnq1a3j58280xikph2iy4mrcq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq vector ]; @@ -185873,8 +186337,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "read-bounded"; - version = "0.1.1.1"; - sha256 = "0l4hhnk1s1a5hqda2bw9dgmid0xcqy40wa49dwv2p6314r9074gx"; + version = "0.1.1.2"; + sha256 = "1h525al4aavplyimhxsvk96cajl8m7rnlqq3wxh9gqlc1sy4ywcg"; libraryHaskellDepends = [ base ]; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; @@ -186264,6 +186728,18 @@ self: { broken = true; }) {}; + "record-hasfield" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "record-hasfield"; + version = "1.0"; + sha256 = "1jlyhj4nlj4hrypdcv7393nccjmfjnh1311incgqhm5wzigjygaj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "A version of GHC.Records as available in future GHCs."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "record-preprocessor" = callPackage ({ mkDerivation, base, base-prelude, basic-lens, conversion , conversion-text, record, record-syntax, text @@ -186878,16 +187354,16 @@ self: { }) {}; "refined" = callPackage - ({ mkDerivation, base, deepseq, exceptions, mtl, prettyprinter - , template-haskell, transformers + ({ mkDerivation, aeson, base, deepseq, exceptions, mtl + , prettyprinter, QuickCheck, template-haskell, these, transformers }: mkDerivation { pname = "refined"; - version = "0.3.0.0"; - sha256 = "106gh7wv6nldgl8rw722n7cam59x34vnr2an6l9hkivfp4pgkkks"; + version = "0.4"; + sha256 = "1cq06zlrfk2rbpbwxqqybqs5474gfvgx1dmqvzriha7zmd68wcx2"; libraryHaskellDepends = [ - base deepseq exceptions mtl prettyprinter template-haskell - transformers + aeson base deepseq exceptions mtl prettyprinter QuickCheck + template-haskell these transformers ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; @@ -186942,19 +187418,19 @@ self: { , monoidal-containers, mtl, prim-uniq, primitive, process, random , ref-tf, reflection, semigroupoids, semigroups, split, stm, syb , template-haskell, these, time, transformers, transformers-compat - , unbounded-delays + , unbounded-delays, witherable }: mkDerivation { pname = "reflex"; - version = "0.5.0.1"; - sha256 = "0al49xxy8zr28v0c9crjwp8khkrm04sbcq98dgkf8c95fi2mrxnb"; + version = "0.6"; + sha256 = "061s74bypbd6s80ipb6rha0fz0y7mwki0dwhg7g9bcmli32pmafp"; libraryHaskellDepends = [ base bifunctors comonad containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta lens MemoTrie monad-control monoidal-containers mtl prim-uniq primitive random ref-tf reflection semigroupoids semigroups stm syb template-haskell these time transformers - transformers-compat unbounded-delays + transformers-compat unbounded-delays witherable ]; testHaskellDepends = [ base bifunctors containers deepseq dependent-map dependent-sum @@ -186989,14 +187465,32 @@ self: { broken = true; }) {}; + "reflex-basic-host" = callPackage + ({ mkDerivation, base, dependent-map, dependent-sum, mtl, primitive + , ref-tf, reflex, stm + }: + mkDerivation { + pname = "reflex-basic-host"; + version = "0.1"; + sha256 = "0fxd46i6jp71dcdmgl1r5hbd9a85fkl5bxhi0dr1gzhy1b9aqc1g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base dependent-map dependent-sum mtl primitive ref-tf reflex stm + ]; + executableHaskellDepends = [ base mtl reflex ]; + description = "A basic `reflex` host for backend work"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflex-dom" = callPackage ({ mkDerivation, base, bytestring, jsaddle-webkit2gtk, reflex , reflex-dom-core, text }: mkDerivation { pname = "reflex-dom"; - version = "0.4"; - sha256 = "0l559x7w1r1mz8j3ln6x0l2kkl1l494q8zm5gai0rcpz9r1nqn9z"; + version = "0.5"; + sha256 = "167yghrwf6fay03y46xf87p9bhr6s3rlxn0yk5vnx1s5i95ps1x5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187045,35 +187539,42 @@ self: { "reflex-dom-core" = callPackage ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder - , bytestring, constraints, containers, contravariant, data-default - , dependent-map, dependent-sum, dependent-sum-template, directory - , exception-transformers, ghcjs-dom, hlint, jsaddle, jsaddle-warp - , keycode, lens, linux-namespaces, monad-control, mtl, network-uri - , primitive, process, ref-tf, reflex, semigroups, stm - , template-haskell, temporary, text, these, transformers, unix - , zenc + , bytestring, chrome-test-utils, constraints, constraints-extras + , containers, contravariant, data-default, dependent-map + , dependent-sum, dependent-sum-template, directory + , exception-transformers, exceptions, filepath, ghcjs-dom, hlint + , hspec, hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp + , keycode, lens, lifted-base, monad-control, mtl, network + , network-uri, primitive, process, random, ref-tf, reflex + , semigroups, silently, stm, template-haskell, temporary, text + , these, transformers, unix, wai, wai-websockets, warp, webdriver + , websockets, zenc }: mkDerivation { pname = "reflex-dom-core"; - version = "0.4"; - sha256 = "1p844d99zj3v54cn8ys12hbyan4f0y3nhgi42b03cq10az2pvsdv"; + version = "0.5"; + sha256 = "1vzlrqgl48krvm58w4mg5s3xwyc565rgjy7f2g1rxxljr30z95p4"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring constraints containers contravariant data-default dependent-map dependent-sum dependent-sum-template directory exception-transformers ghcjs-dom - jsaddle keycode lens monad-control mtl network-uri primitive ref-tf - reflex semigroups stm template-haskell text these transformers unix - zenc + jsaddle keycode lens monad-control mtl network-uri primitive random + ref-tf reflex semigroups stm template-haskell text these + transformers unix zenc ]; testHaskellDepends = [ - base hlint jsaddle jsaddle-warp linux-namespaces process reflex - temporary unix + aeson base bytestring chrome-test-utils constraints + constraints-extras containers dependent-map dependent-sum + dependent-sum-template directory exceptions filepath ghcjs-dom + hlint hspec hspec-webdriver http-types HUnit jsaddle jsaddle-warp + lens lifted-base network process random ref-tf reflex silently + temporary text wai wai-websockets warp webdriver websockets ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {chrome-test-utils = null;}; "reflex-dom-fragment-shader-canvas" = callPackage ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, lens @@ -187196,15 +187697,15 @@ self: { }: mkDerivation { pname = "reflex-sdl2"; - version = "0.2.0.0"; - sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw"; + version = "0.3.0.0"; + sha256 = "1mjynfdxnjdd308jp2gcpl8x00pmzshm81ramls7hzmkkvfm2xdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base containers dependent-sum exception-transformers mtl primitive ref-tf reflex sdl2 stm ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base mtl reflex ]; description = "SDL2 and reflex FRP"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -188503,6 +189004,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, QuickCheck, stm + , tasty, tasty-hedgehog, text, transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "0.5.0"; + sha256 = "108xd4ybfj7v0cc0h71cym0z31fzsi17aad2l3s17j11h6ainhbm"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring doctest Glob hedgehog QuickCheck tasty + tasty-hedgehog text + ]; + benchmarkHaskellDepends = [ + base containers gauge unordered-containers + ]; + description = "Custom prelude from Kowainik"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -193194,8 +193720,8 @@ self: { }: mkDerivation { pname = "safe-money"; - version = "0.7"; - sha256 = "1cwha4s0dckdb7xrh1snxrismzr5gq586l9vmih9gmy2nrrw69y9"; + version = "0.8"; + sha256 = "0a8dvdlia7b6ybrynbv5a87nvl29x2h9abnx9j446ma07s0cvxcc"; libraryHaskellDepends = [ base binary constraints deepseq hashable QuickCheck text vector-space @@ -193216,8 +193742,8 @@ self: { }: mkDerivation { pname = "safe-money-aeson"; - version = "0.1"; - sha256 = "0qifhkyjgxfnfmbmysc4ma3hvyi2l0c238c75wlf5x1hz8q1ka8p"; + version = "0.1.1"; + sha256 = "1m8wwgxz632l5palqzjigk34c62qkbhqdy36wfnj50vh3d675c23"; libraryHaskellDepends = [ aeson base safe-money text ]; testHaskellDepends = [ aeson base bytestring safe-money tasty tasty-hunit tasty-quickcheck @@ -193235,8 +193761,8 @@ self: { }: mkDerivation { pname = "safe-money-cereal"; - version = "0.1"; - sha256 = "02bzl1r4vymnb0xyagzrcgb2kxr892wivyasp7dkn41shgafaqzb"; + version = "0.1.1"; + sha256 = "0ppsaryp1pzbikjf3v5v73gjy8dg3h73yk72xcm3xmhna4msvia4"; libraryHaskellDepends = [ base cereal safe-money ]; testHaskellDepends = [ base bytestring cereal safe-money tasty tasty-hunit @@ -193254,8 +193780,8 @@ self: { }: mkDerivation { pname = "safe-money-serialise"; - version = "0.1"; - sha256 = "16h8yf622szzc3v5xa2s7fsjaxk7cx9hqngjn796sdcg681g7xf5"; + version = "0.1.1"; + sha256 = "1v3pqsnjid6fyxr7ybxdyn6f4c3z9kh2s1f3hh75q5adgw80pbp6"; libraryHaskellDepends = [ base bytestring safe-money serialise ]; testHaskellDepends = [ base bytestring safe-money serialise tasty tasty-hunit @@ -193273,8 +193799,8 @@ self: { }: mkDerivation { pname = "safe-money-store"; - version = "0.1"; - sha256 = "0hbqichsmxd3xw1abcdyyyg1rrzfkfmywgj47f4yv6pmmvihrkh8"; + version = "0.1.1"; + sha256 = "1hav6sk8vnfpn773a1baqclklq04c4dhz6ihirwlbxaz7wdl78qj"; libraryHaskellDepends = [ base bytestring safe-money store ]; testHaskellDepends = [ base bytestring safe-money store tasty tasty-hunit tasty-quickcheck @@ -193292,8 +193818,8 @@ self: { }: mkDerivation { pname = "safe-money-xmlbf"; - version = "0.1"; - sha256 = "022mcl1gwvwjpjv56938bpklc15r9m6xvsyjhxmnb6d8apjzhpxk"; + version = "0.1.1"; + sha256 = "0624wkb3hsmr3rjm1x95zr5zl1cxhvlyzmc8b1p8px8jyxg9p3n6"; libraryHaskellDepends = [ base safe-money text xmlbf ]; testHaskellDepends = [ base bytestring safe-money tasty tasty-hunit tasty-quickcheck text @@ -198165,8 +198691,8 @@ self: { }: mkDerivation { pname = "servant-client-namedargs"; - version = "0.1.1.0"; - sha256 = "11638zddkdna50lxiyk8ya1hakkriymlyvz6l6zli94ri5a3lprg"; + version = "0.1.1.1"; + sha256 = "1byk3baams1kg1zfnp0y02s2kbg1w62gsri0z43x56g33pgwbsrp"; libraryHaskellDepends = [ base named servant servant-client-core servant-namedargs text ]; @@ -198913,8 +199439,8 @@ self: { ({ mkDerivation, base, hspec, named, QuickCheck, servant, text }: mkDerivation { pname = "servant-namedargs"; - version = "0.1.1.0"; - sha256 = "10y1a9cr5fb794nqck1dmdr4dr6yl2x32zwsk1l2k4zfwy9bwyj1"; + version = "0.1.1.1"; + sha256 = "15fdqk89si2ri63cpdndvp8kjlanf783fwgra899ldwizf637ka7"; libraryHaskellDepends = [ base named servant text ]; testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; @@ -199377,8 +199903,8 @@ self: { }: mkDerivation { pname = "servant-server-namedargs"; - version = "0.1.1.0"; - sha256 = "1i810rw4kncpfyh2q67bqyiw6mh9pbhl4m40x2clwfsxqqpnkyda"; + version = "0.1.1.1"; + sha256 = "16lgnsq66rrjnky409c49pdr1dfq6d8p96gd1dhph2vwq2156fsd"; libraryHaskellDepends = [ base bytestring http-api-data http-types named servant servant-namedargs servant-server string-conversions text wai @@ -200875,31 +201401,34 @@ self: { "shake" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, directory - , extra, filepath, filepattern, hashable, heaps, js-flot, js-jquery - , primitive, process, QuickCheck, random, time, transformers, unix - , unordered-containers, utf8-string + , extra, filepath, filepattern, hashable, heaps, js-dgtable + , js-flot, js-jquery, primitive, process, QuickCheck, random, time + , transformers, unix, unordered-containers, utf8-string }: mkDerivation { pname = "shake"; - version = "0.17.6"; - sha256 = "17vyd7qd9x2ild3mpwbqhsy9270bl5pdpjrhracs9p83isw4sa1k"; + version = "0.17.7"; + sha256 = "09gp3469lljgqmlkznpxl87l1wc91vdv2q6phh65jpkfjdhjp0rv"; + revision = "1"; + editedCabalFile = "1ld0k6vv8v8znnihps4z93555hs2n77ga6xk8g642bmrg67fnb7j"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-flot js-jquery primitive process random time - transformers unix unordered-containers utf8-string + hashable heaps js-dgtable js-flot js-jquery primitive process + random time transformers unix unordered-containers utf8-string ]; executableHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-flot js-jquery primitive process random time - transformers unix unordered-containers utf8-string + hashable heaps js-dgtable js-flot js-jquery primitive process + random time transformers unix unordered-containers utf8-string ]; testHaskellDepends = [ base binary bytestring deepseq directory extra filepath filepattern - hashable heaps js-flot js-jquery primitive process QuickCheck - random time transformers unix unordered-containers utf8-string + hashable heaps js-dgtable js-flot js-jquery primitive process + QuickCheck random time transformers unix unordered-containers + utf8-string ]; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; @@ -200912,8 +201441,8 @@ self: { }: mkDerivation { pname = "shake-ats"; - version = "1.10.2.0"; - sha256 = "0kc7yy2qv4d2n3j0qwsg37ga9yyb380d6zni08l1jabrl84maly8"; + version = "1.10.2.1"; + sha256 = "1y85rrrrcd7jz51ir6cwa3w23ldi4fkc215iqj1crbxfjzrphacn"; libraryHaskellDepends = [ base binary dependency directory hs2ats language-ats microlens shake shake-c shake-cabal shake-ext text @@ -200926,23 +201455,24 @@ self: { ({ mkDerivation, base, cdeps, composition-prelude, shake }: mkDerivation { pname = "shake-c"; - version = "0.4.0.0"; - sha256 = "1n8pm0431dxbrk3fqn1mijgvqbz4i7jcc8pqy60cj76p88kdn24q"; + version = "0.4.2.0"; + sha256 = "13ma1mavah98rmxisd4hw5ja96kzbcd36gzxlrsdsjz72i7k9xlh"; libraryHaskellDepends = [ base cdeps composition-prelude shake ]; description = "Library for building C code with shake"; license = stdenv.lib.licenses.bsd3; }) {}; "shake-cabal" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, directory - , filepath, shake + ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq + , directory, filepath, hashable, shake }: mkDerivation { pname = "shake-cabal"; - version = "0.2.0.0"; - sha256 = "13fzc57jl52c6j1wjmp4z39jwbqrnlwl5l8vxqk6hz814apsd555"; + version = "0.2.1.1"; + sha256 = "0d3c1v7pj568fj65fz7dd4h72wpnzz75n1k974nmjbx12vphfd1i"; libraryHaskellDepends = [ - base Cabal composition-prelude directory filepath shake + base binary Cabal composition-prelude deepseq directory filepath + hashable shake ]; description = "Shake library for use with cabal"; license = stdenv.lib.licenses.bsd3; @@ -202624,12 +203154,12 @@ self: { }) {}; "simple-cmd" = callPackage - ({ mkDerivation, base, directory, filepath, process }: + ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { pname = "simple-cmd"; - version = "0.1.3"; - sha256 = "04bbdfmfy08fl07f0pqzp31jy4fdky4d9hazyxpqla8m3rs49xa9"; - libraryHaskellDepends = [ base directory filepath process ]; + version = "0.1.3.1"; + sha256 = "075fcidyq93cm1y8ag5z50n7zvv0fmi9c6j1wmrzj2972cr16g9p"; + libraryHaskellDepends = [ base directory filepath process unix ]; description = "Simple String-based process commands"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -208590,6 +209120,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "splitmix_0_0_2" = callPackage + ({ mkDerivation, async, base, base-compat-batteries, bytestring + , containers, criterion, deepseq, process, random, tf-random, time + , vector + }: + mkDerivation { + pname = "splitmix"; + version = "0.0.2"; + sha256 = "1y9vlik5icwimw6c8zh9pzgp0pbxvwxg48r54qsypnn1p4dbgaz6"; + libraryHaskellDepends = [ base deepseq random time ]; + testHaskellDepends = [ + async base base-compat-batteries bytestring deepseq process random + tf-random vector + ]; + benchmarkHaskellDepends = [ + base containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -212049,15 +212601,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_34_0" = callPackage + "stratosphere_0_35_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.34.0"; - sha256 = "0nrpwc17pmvrd8r0l6k142ihc51vwi2j55009lw1dph4n54zgs4h"; + version = "0.35.0"; + sha256 = "0jwnr6g2ig2p43sd5xvj4n9jkq5waiwx9k1fpryjmi1jvc128zqa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -213002,8 +213554,8 @@ self: { }: mkDerivation { pname = "strict-list"; - version = "0.1.0.1"; - sha256 = "13s3bwg9zslh04i5djvlf7wfs3ckn3sscxvlawj9nsi3md4fsvdz"; + version = "0.1.4"; + sha256 = "0jh158yjly9p54fgbxjxspdnicryik1ax3mlc6i7351v564yc7cz"; libraryHaskellDepends = [ base semigroupoids ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -213160,14 +213712,14 @@ self: { "string-interpolate" = callPackage ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-meta, hspec, interpolate, QuickCheck - , quickcheck-instances, quickcheck-text, template-haskell, text - , text-conversions, utf8-string + , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 + , Interpolation, QuickCheck, quickcheck-instances, quickcheck-text + , template-haskell, text, text-conversions, utf8-string }: mkDerivation { pname = "string-interpolate"; - version = "0.0.1.0"; - sha256 = "1mc2xg1aybqjrsqlk0w7vkdydxzxr1vknbh6ad3w355svrb6krxm"; + version = "0.1.0.0"; + sha256 = "1q80rkp7qhha1swz47rkjmpnmnr4p5837s1179l43v1117ck0yqa"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text text-conversions utf8-string @@ -213177,9 +213729,10 @@ self: { quickcheck-text text ]; benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate text + base bytestring criterion formatting interpolate + interpolatedstring-perl6 Interpolation QuickCheck text ]; - description = "Haskell string interpolation that just works"; + description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -213622,6 +214175,8 @@ self: { pname = "strongswan-sql"; version = "1.2.2.0"; sha256 = "0dv52cf6v84f8q6kckwbgw85iqckd17q3gqif6fh7xrx1z4vhimb"; + revision = "1"; + editedCabalFile = "138pksvpff0qggfsiv8s9r45z1ph4779flfm5hxb9br7bh5klslc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214523,7 +215078,6 @@ self: { description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "supercollider-ht" = callPackage @@ -214847,6 +215401,8 @@ self: { pname = "sv-core"; version = "0.4"; sha256 = "0m87rffkv5716dh6v00p4gc257fdc81fahjafs02kkf8fbiivmkh"; + revision = "1"; + editedCabalFile = "0qzklsb21ha7jgfgx3h565pc3659hd3h1l0ci1yr0mdmj08ignbs"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -215508,6 +216064,132 @@ self: { broken = true; }) {}; + "symantic-http" = callPackage + ({ mkDerivation, base, bytestring, http-api-data, http-media + , http-types, network-uri, stm, text, time, transformers + }: + mkDerivation { + pname = "symantic-http"; + version = "0.0.0.20190324"; + sha256 = "0fvj527b5wjq0wfvzd0n8zna4cy5x1ngj47ysrvyv30ddvh94r4c"; + libraryHaskellDepends = [ + base bytestring http-api-data http-media http-types network-uri stm + text time transformers + ]; + description = "Symantic combinators for deriving clients or a server from an HTTP API"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-client" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-client, http-media, http-types, monad-classes + , network-uri, stm, symantic-http, text, time, transformers, word8 + }: + mkDerivation { + pname = "symantic-http-client"; + version = "0.0.0.20190324"; + sha256 = "0y7va5gnf285h2hv82jfjq63k141mwgy8h4s1wbdqmjirrh75d1d"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-client http-media http-types monad-classes network-uri stm + symantic-http text time transformers word8 + ]; + description = "symantic-http applied to the derivation of HTTP clients"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-demo" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-client, http-media, http-types, monad-classes + , network, network-uri, pipes, pipes-bytestring, pipes-safe + , symantic-http, symantic-http-client, symantic-http-pipes + , symantic-http-server, text, time, transformers, wai, wai-extra + , warp + }: + mkDerivation { + pname = "symantic-http-demo"; + version = "0.0.0.0"; + sha256 = "09fkni3zal4bvhf00b57qpf83bk7azcxps4s9nd01zsmnzvhlfs7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base pipes symantic-http text ]; + executableHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-client http-media http-types monad-classes network network-uri + pipes pipes-bytestring pipes-safe symantic-http + symantic-http-client symantic-http-pipes symantic-http-server text + time transformers wai wai-extra warp + ]; + description = "Demo for symantic-http and its companion libraries"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-pipes" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-media, http-types, lens-family-core + , monad-classes, network-uri, pipes, pipes-bytestring, pipes-group + , pipes-parse, pipes-safe, stm, symantic-http, text, time + , transformers, word8 + }: + mkDerivation { + pname = "symantic-http-pipes"; + version = "0.0.0.20190324"; + sha256 = "0c44vcvcpjlpj2wc58mqaaky68s3cjqa8gimv3nnj634m2avmsll"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-media http-types lens-family-core monad-classes network-uri + pipes pipes-bytestring pipes-group pipes-parse pipes-safe stm + symantic-http text time transformers word8 + ]; + description = "Streaming support through pipes for symantic-http"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-server" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , http-api-data, http-media, http-types, monad-classes, network-uri + , stm, symantic-http, text, time, transformers, wai, warp, word8 + }: + mkDerivation { + pname = "symantic-http-server"; + version = "0.0.0.20190324"; + sha256 = "0drng8xsafq5xm08frjg4fc206lxwb7wq2jj6n7zlv8k3nfnzvzy"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers http-api-data + http-media http-types monad-classes network-uri stm symantic-http + text time transformers wai warp word8 + ]; + description = "symantic-http applied to the derivation of HTTP servers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-http-test" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , deepseq, filepath, hashable, hspec, hspec-wai, http-api-data + , http-client, http-media, http-types, monad-classes, network + , network-uri, pipes, pipes-bytestring, pipes-safe, symantic-http + , symantic-http-client, symantic-http-pipes, symantic-http-server + , tasty, tasty-hspec, tasty-hunit, text, time, transformers, wai + , wai-extra, warp + }: + mkDerivation { + pname = "symantic-http-test"; + version = "0.0.0.20190324"; + sha256 = "0ppxdy1m1a0y3jbkbcaf1syknk5ybri1scs5vhkphvm50fa21qcj"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base base64-bytestring bytestring containers deepseq filepath + hashable hspec hspec-wai http-api-data http-client http-media + http-types monad-classes network network-uri pipes pipes-bytestring + pipes-safe symantic-http symantic-http-client symantic-http-pipes + symantic-http-server tasty tasty-hspec tasty-hunit text time + transformers wai wai-extra warp + ]; + description = "Test symantic-http and its companion libraries"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "symantic-lib" = callPackage ({ mkDerivation, base, bytestring, containers, megaparsec , monad-classes, mono-traversable, symantic, symantic-grammar @@ -217876,12 +218558,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_2_0_0_0" = callPackage + "tasty-dejafu_2_0_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.0"; - sha256 = "1jy1rh26xr64kwvywcfmb55x088hbrg8dhcixy9lhw76xrzjpkia"; + version = "2.0.0.1"; + sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; @@ -218677,6 +219359,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tds" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , hostname, mtl, network, stm, streaming, streaming-attoparsec + , streaming-bytestring, tardis, text, transformers, unix, vector + }: + mkDerivation { + pname = "tds"; + version = "0.1.0.0"; + sha256 = "1irgp0sv20vlzvyc09wa8ycf3k120ab623r901n638hrwvrwmz43"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec attoparsec-binary base bytestring hostname mtl network + stm streaming streaming-attoparsec streaming-bytestring tardis text + transformers unix vector + ]; + executableHaskellDepends = [ base ]; + description = "Pure Haskell TDS protocol implementation. Mainly for beam-mssql and beam-sybase"; + license = stdenv.lib.licenses.mit; + }) {}; + "teams" = callPackage ({ mkDerivation, base, containers, fgl, graphviz }: mkDerivation { @@ -221216,6 +221919,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_8" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-abstraction, th-lift + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.8"; + sha256 = "1yqmyfmnnph28v0c0rkh0z38xaxrrsljf1zg6zccqw322frw9fsi"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-abstraction th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bytestring + bytestring-builder deriving-compat generic-deriving ghc-prim hspec + nats QuickCheck quickcheck-instances semigroups tagged + template-haskell text transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -221942,6 +222678,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_7" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.7"; + sha256 = "0qqxrm04nqh062cw6a2p6grvvfpg0nxkj3aymmar29yky17y8vgy"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -222930,24 +223686,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, colour, containers, hosc - , microspec, mwc-random, network, parsec, template-haskell, text - , transformers, vector - }: - mkDerivation { - pname = "tidal"; - version = "1.0.8"; - sha256 = "0mxwaalbc23rmk163r40vqw15f3kjg5bagpq7f6rn3nyks7095qz"; - libraryHaskellDepends = [ - base bifunctors colour containers hosc mwc-random network parsec - template-haskell text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_0_10" = callPackage ({ mkDerivation, base, bifunctors, colour, containers, hosc , microspec, mwc-random, network, parsec, template-haskell, text , transformers, vector @@ -222963,7 +223701,6 @@ self: { testHaskellDepends = [ base containers microspec parsec ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -225055,8 +225792,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.1.3.1"; - sha256 = "0av2fr2y1b70rxfqsz1kfgkfj7i5j76zpn351r2s8navwa4pf116"; + version = "0.1.4.0"; + sha256 = "1wg5gx7iydwhnp8xj72lmgpa7n5dd62cxjswlkplj944c2szdmdp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226172,44 +226909,36 @@ self: { "trasa" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hashable - , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, vinyl + , http-media, http-types, quantification, text + , unordered-containers }: mkDerivation { pname = "trasa"; - version = "0.3"; - sha256 = "0v1srhmzwc8vdkwwpik91bvrq73driryl0lyazx7zvpvmqhxkmi6"; + version = "0.4"; + sha256 = "059zbm4bfzcv0qlvr55l49xs5izycb2hdjbyqvri5f3vrnwnic1q"; libraryHaskellDepends = [ - base binary bytestring hashable http-media http-types text - unordered-containers vinyl - ]; - testHaskellDepends = [ - base bytestring doctest tasty tasty-hunit tasty-quickcheck text - vinyl + base binary bytestring hashable http-media http-types + quantification text unordered-containers ]; + testHaskellDepends = [ base doctest ]; description = "Type Safe Web Routing"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "trasa-client" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive - , containers, http-client, http-media, http-types, ip, text, trasa - , unordered-containers + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, http-client, http-media, http-types, text, trasa }: mkDerivation { pname = "trasa-client"; - version = "0.3"; - sha256 = "1cq0wbjv0kbhvprrggbkqqy6h6ixywfr816b9pd2qqmsnw4lq6ns"; + version = "0.4"; + sha256 = "0xfqjvc1a4vbm8kvw1s11n174sc33hb7psd5lwpa6hipifw3kmb1"; libraryHaskellDepends = [ base binary bytestring case-insensitive containers http-client http-media http-types text trasa ]; - testHaskellDepends = [ - aeson base http-client http-types ip text trasa - unordered-containers - ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -226235,27 +226964,38 @@ self: { "trasa-server" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers - , doctest, http-client, http-media, http-types, mtl, tasty - , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp + , http-media, http-types, mtl, text, trasa, wai }: mkDerivation { pname = "trasa-server"; - version = "0.2"; - sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy"; + version = "0.4"; + sha256 = "1xh85kh9ilsq8zy19if4s93zmjqxbpgqpvhkh9jpk8klia7zc0pv"; libraryHaskellDepends = [ base bytestring case-insensitive containers http-media http-types mtl text trasa wai ]; - testHaskellDepends = [ - base bytestring doctest http-client tasty tasty-hunit - tasty-quickcheck text trasa vinyl warp - ]; description = "Type safe web server"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "trasa-th" = callPackage + ({ mkDerivation, base, containers, megaparsec, template-haskell + , trasa + }: + mkDerivation { + pname = "trasa-th"; + version = "0.4"; + sha256 = "1jfnm0im5qk6s6a9fbdrz228mic5ribi53fyl7nnk8gsr5lrl22z"; + libraryHaskellDepends = [ + base containers megaparsec template-haskell trasa + ]; + testHaskellDepends = [ base trasa ]; + description = "Template Haskell to generate trasa routes"; + license = stdenv.lib.licenses.mit; + }) {}; + "traverse-with-class" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, template-haskell , transformers @@ -229977,33 +230717,35 @@ self: { }) {}; "unbeliever" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal - , chronologique, containers, deepseq, directory, exceptions - , fingertree, gauge, hashable, hourglass, hspec, mtl, prettyprinter + ({ mkDerivation, aeson, async, base, bytestring, chronologique + , containers, deepseq, directory, exceptions, fingertree, gauge + , hashable, hourglass, hspec, mtl, prettyprinter , prettyprinter-ansi-terminal, safe-exceptions, scientific, stm , template-haskell, terminal-size, text, text-short, transformers , unix, unordered-containers, vector }: mkDerivation { pname = "unbeliever"; - version = "0.9.2.0"; - sha256 = "0fy9slvc0gvxr6z7zmz1xyk5qkxrfq4nbs9q8z11viqp0qg0yssx"; + version = "0.9.3.2"; + sha256 = "1gsjmr9h7w08576smi978k5djhvjk4ry0ljgr6zxx7nj7cy1m84b"; + revision = "1"; + editedCabalFile = "0mlbjb79ylk2jb7mp6da1xfl2r28zfijwv5dd2l73l9mgi5h0s72"; libraryHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree hashable hourglass mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short transformers unix unordered-containers vector ]; testHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree hashable hourglass hspec mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short transformers unix unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson async base bytestring Cabal chronologique containers deepseq + aeson async base bytestring chronologique containers deepseq directory exceptions fingertree gauge hashable hourglass mtl prettyprinter prettyprinter-ansi-terminal safe-exceptions scientific stm template-haskell terminal-size text text-short @@ -232659,8 +233401,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "util"; - version = "0.1.12.0"; - sha256 = "0qm7bm5dmcz7kn9p882fwpihj5azm2baxz68jnimmw1mp5w66fw2"; + version = "0.1.13.0"; + sha256 = "15b5m2v1v4ab65cfd6ppwinq2pnv5212g1qwnyw6rwyiaac8k3gd"; libraryHaskellDepends = [ base ]; description = "Utilities"; license = stdenv.lib.licenses.bsd3; @@ -233303,6 +234045,17 @@ self: { broken = true; }) {}; + "valid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "valid"; + version = "0.1.0.0"; + sha256 = "10nrr48ki8vxckbz1q24nn2x8vwflj4ndgvlj99ishyypb1ijx37"; + libraryHaskellDepends = [ base ]; + description = "Type isomorphic to `Either` with `Applicative` instance which combines errors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "valid-names" = callPackage ({ mkDerivation, base, containers, MonadRandom }: mkDerivation { @@ -234268,8 +235021,8 @@ self: { }: mkDerivation { pname = "vector-extras"; - version = "0.2.1"; - sha256 = "1s9syai0bfdmwzj5r9snxi5plfl2bwnjyyh8dd2w7jmgdy0pkbiz"; + version = "0.2.1.1"; + sha256 = "0q5wm0hfk84hr9rgbb084d222ys0k1hab5cydwnnrpb7wy42199p"; libraryHaskellDepends = [ base containers deferred-folds foldl hashable unordered-containers vector @@ -234901,8 +235654,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.27"; - sha256 = "0yfrh7ifgn4vw9yqn0rif040sabbgs2j42rkds48fam30cdr12v6"; + version = "0.0.0.28"; + sha256 = "1l2cjisay7vbqb64xd4lkz594x2ji2gs249h9j4anbifzg6bbjb2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235756,8 +236509,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "vulkan-api"; - version = "1.1.3.0"; - sha256 = "1sd7rasg7305dlfq1mwyxw45gwy4ria0cbcd18pnilwjgsla7kvc"; + version = "1.1.3.1"; + sha256 = "00wv54ggmmvq1lc9rmp9jn910m5sa30l772p28r2qsq4i8cxrbcy"; libraryHaskellDepends = [ base ]; description = "Low-level low-overhead vulkan api bindings"; license = stdenv.lib.licenses.bsd3; @@ -236379,6 +237132,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-lambda" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive + , directory, http-types, iproute, network, temporary, text + , unliftio, unordered-containers, vault, wai + }: + mkDerivation { + pname = "wai-lambda"; + version = "0.1.0.0"; + sha256 = "1m77i3zazvpa4jirvgxjdik5fnzarrbmavvi48d72c8a8jjwsx9x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring case-insensitive directory http-types + iproute network temporary text unliftio unordered-containers vault + wai + ]; + executableHaskellDepends = [ + aeson base binary bytestring case-insensitive directory http-types + iproute network temporary text unliftio unordered-containers vault + wai + ]; + description = "Haskell Webapps on AWS Lambda"; + license = stdenv.lib.licenses.mit; + }) {}; + "wai-lens" = callPackage ({ mkDerivation, base, bytestring, http-types, lens, network, text , vault, wai @@ -239210,8 +239988,8 @@ self: { ({ mkDerivation, base, deepseq, mtl, process, split, temporary }: mkDerivation { pname = "weigh"; - version = "0.0.13"; - sha256 = "1ylfx0y9m8h3c2lwdil5l9mvngad419zd8qk7kw85s4hvnss9fp4"; + version = "0.0.14"; + sha256 = "0l85marb5rl9nr1c0id42dnr5i9fk1jciy5h6lywhb34w3hbj61g"; libraryHaskellDepends = [ base deepseq mtl process split temporary ]; @@ -239748,6 +240526,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "winery_1_0_1" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , containers, cpu, deepseq, directory, fast-builder, gauge + , hashable, HUnit, megaparsec, mtl, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances + , scientific, semigroups, serialise, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "winery"; + version = "1.0.1"; + sha256 = "03g397c7s13brm5jsdzrwg5vyanvj6yznhn95aax7a8dwvhphk2n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers cpu fast-builder hashable HUnit + megaparsec mtl prettyprinter prettyprinter-ansi-terminal QuickCheck + scientific semigroups text time transformers unordered-containers + vector + ]; + executableHaskellDepends = [ + aeson base bytestring megaparsec prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring containers fast-builder QuickCheck + quickcheck-instances scientific text time unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + aeson base binary bytestring cereal deepseq directory gauge + serialise text + ]; + description = "Sustainable serialisation library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "winio" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, kernel32 , network, winerror, ws2_32 @@ -245645,26 +246461,27 @@ self: { "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, byteable, bytestring, case-insensitive, cereal - , clientsession, conduit, conduit-extra, containers, cookie - , deepseq, fast-logger, gauge, hspec, hspec-expectations - , http-types, HUnit, monad-logger, mtl, network, parsec - , path-pieces, primitive, random, resourcet, rio, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , unix-compat, unliftio, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, rio, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 }: mkDerivation { pname = "yesod-core"; - version = "1.6.12"; - sha256 = "1zyvjbphzkhch4wv8lj019dd3jnyicdj514fhy1ggwqkff3kyblj"; + version = "1.6.13"; + sha256 = "0a7rsm71d8a0snbx6x9hj4ba0f0vg51rwzchsgvrh6fdfm0clkgq"; libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup byteable bytestring + aeson auto-update base blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types monad-logger mtl - parsec path-pieces primitive random resourcet rio shakespeare - template-haskell text time transformers unix-compat unliftio - unordered-containers vector wai wai-extra wai-logger warp word8 + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet rio + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 ]; testHaskellDepends = [ async base bytestring clientsession conduit conduit-extra diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index fd270dedefcc..158987d4e0ef 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ stdenv, pkgsBuildBuild, buildPackages , fetchurl, makeWrapper, gawk, pkgconfig , libtool, readline, gmp }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - buildPackages.buildPackages.guile_1_8; + pkgsBuildBuild.guile_1_8; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 433271d9c85e..17ca1d1dcd95 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ stdenv, pkgsBuildBuild, buildPackages , fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null @@ -22,7 +22,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - buildPackages.buildPackages.guile_2_0; + pkgsBuildBuild.guile_2_0; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 1943b10bdcaf..5e458c6e2ccc 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages +{ stdenv, pkgsBuildBuild, buildPackages , fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null @@ -23,7 +23,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - buildPackages.buildPackages.guile; + pkgsBuildBuild.guile; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; buildInputs = [ readline libtool libunistring libffi ]; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f6990fd29d01..9adc72f941a2 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -185,7 +185,7 @@ in rec { # the latest Devel version perldevel = common { - version = "5.29.6"; - sha256 = "0wj2bia8s30788f69mf5s533l72zbhqpdr85kkk97yrh1c9sgcd6"; + version = "5.29.9"; + sha256 = "017x3nghyc5m8q1yqnrdma96b3d5rlfx87vv5mi64jq0r8k6zppm"; }; } diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index e147a05d3cd8..2fbf7a0be2cf 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -7,6 +7,7 @@ , gst-plugins-bad ? null , libnotify ? null , gnome3 ? null +, gtk3 ? null , enableUsb ? true , enablePacketSocket ? true , enableViewer ? true @@ -26,19 +27,19 @@ in assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; assert enableViewer -> gnome3 != null; + assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.5.13"; - name = "${pname}-${version}"; + version = "0.6.1"; src = fetchFromGitHub { owner = "AravisProject"; - repo = "aravis"; - rev= "c56e530b8ef53b84e17618ea2f334d2cbae04f48"; - sha256 = "1dj24dir239zmiscfhyy1m8z5rcbw0m1vx9lipx0r7c39bzzj5gy"; + repo = pname; + rev= "ARAVIS_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "0v0hv1iyhp2azxij3ighp1b4rsw99zyqmkpdqnnxdmkcna031iga"; }; outputs = [ "bin" "dev" "out" "lib" ]; @@ -55,7 +56,7 @@ in ++ stdenv.lib.optional enableUsb libusb ++ stdenv.lib.optional enablePacketSocket audit ++ stdenv.lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ stdenv.lib.optionals (enableViewer) [ libnotify gnome3.gtk3 gnome3.adwaita-icon-theme ]; + ++ stdenv.lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; preAutoreconf = ''./autogen.sh''; @@ -80,7 +81,7 @@ in longDescription = '' Implements the gigabit ethernet and USB3 protocols used by industrial cameras. ''; - homepage = https://aravisproject.github.io/docs/aravis-0.5; + homepage = "https://aravisproject.github.io/docs/aravis-0.5"; license = stdenv.lib.licenses.lgpl2; maintainers = []; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 297883ecd0a4..f276d0bf12ee 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libdaemon, dbus, perlPackages +{ fetchurl, fetchpatch, stdenv, pkgconfig, libdaemon, dbus, perlPackages , expat, gettext, intltool, glib, libiconv , gtk3Support ? false, gtk3 ? null , qt4 ? null @@ -16,7 +16,14 @@ stdenv.mkDerivation rec { sha256 = "0128n7jlshw4bpx0vg8lwj8qwdisjxi7mvniwfafgnkzzrfrpaap"; }; - patches = [ ./no-mkdir-localstatedir.patch ]; + patches = [ + ./no-mkdir-localstatedir.patch + (fetchpatch { + name ="CVE-2017-6519-CVE-2018-100084.patch"; + url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch; + sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; + }) + ]; buildInputs = [ libdaemon dbus glib expat libiconv ] ++ (with perlPackages; [ perl XMLParser ]) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index ffe027c89612..666db6f88e22 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch2-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="1p2y6fhxfmb48nl03xdg62nfrwssaaiw10vzr194z6srcj90n2r7"; + sha256="05j01v4hmw0vv5vcj11pbngl200b3j2yvawk08fw9a249jzx6v1a"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index 995844524dcf..d38aa7f0f958 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, cmake }: stdenv.mkDerivation rec { - name = "cmocka-${version}"; + pname = "cmocka"; majorVersion = "1.1"; - version = "${majorVersion}.1"; + version = "${majorVersion}.3"; src = fetchurl { url = "https://cmocka.org/files/${majorVersion}/cmocka-${version}.tar.xz"; - sha256 = "f02ef48a7039aa77191d525c5b1aee3f13286b77a13615d11bc1148753fc0389"; + sha256 = "1bxzzafjlwzgldcb07hjnlnqvh88wh21r2kw7z8f704w5bvvrsj3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index fb7ec512319e..f0f31ae1ffc4 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -1,27 +1,57 @@ -{ stdenv, fetchurl, python, pkgconfig -, glib, icu, gobject-introspection }: +{ stdenv +, fetchgit +, pkgconfig +, glib +, icu +, gobject-introspection +, dbus-glib +, vala +, python3 +, autoreconfHook +}: stdenv.mkDerivation rec { - name = "dee-${version}"; - version = "1.2.7"; + pname = "dee"; + version = "unstable-2017-06-16"; - src = fetchurl { - url = "https://launchpad.net/dee/1.0/${version}/+download/${name}.tar.gz"; - sha256 = "12mzffk0lyd566y46x57jlvb9af152b4dqpasr40zal4wrn37w0v"; + outputs = [ "out" "dev" "py" ]; + + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/dee"; + rev = "import/1.2.7+17.10.20170616-4ubuntu1"; + sha256 = "0q3d9d6ahcyibp6x23g1wvjfcppjh9v614s328yjmx47216z7394"; }; - buildInputs = [ glib gobject-introspection icu ]; - nativeBuildInputs = [ python pkgconfig ]; + patches = [ + "${src}/debian/patches/gtkdocize.patch" + "${src}/debian/patches/strict-prototype.patch" + "${src}/debian/patches/icu-pkg-config.patch" + ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=misleading-indentation" ]; # gcc-6 + nativeBuildInputs = [ + pkgconfig + vala + autoreconfHook + gobject-introspection + python3 + ]; - enableParallelBuilding = true; + buildInputs = [ + glib + icu + dbus-glib + ]; + + configureFlags = [ + "--disable-gtk-doc" + "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" + ]; meta = with stdenv.lib; { description = "A library that uses DBus to provide objects allowing you to create Model-View-Controller type programs across DBus"; homepage = https://launchpad.net/dee; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar worldofpeace ]; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index f7968380e29b..306b4e22cfc9 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -75,7 +75,7 @@ , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libiconv ? null #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) -#, libmfx ? null # Hardware acceleration vis libmfx +, libmfx ? null # Hardware acceleration vis libmfx , libmodplug ? null # ModPlug support , libmysofa ? null # HRTF support via SOFAlizer #, libnut ? null # NUT (de)muxer, native (de)muser exists @@ -156,12 +156,13 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libmxf libnut libquvi nvenc opencl openh264 oss shine twolame + * libnut libquvi nvenc opencl openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: - * frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg, - * pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs + * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh + * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab + * wavpack x265 xavs * * Not supported: * stagefright-h264(android only) @@ -231,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp"; + sha256 = "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr"; }; prePatch = '' @@ -343,7 +344,7 @@ stdenv.mkDerivation rec { (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") (enableFeature (libiconv != null) "iconv") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") - #(enableFeature (libmfx != null) "libmfx") + (enableFeature (if isLinux then libmfx != null else false) "libmfx") (enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmysofa != null) "libmysofa") #(enableFeature (libnut != null) "libnut") @@ -416,6 +417,7 @@ stdenv.mkDerivation rec { ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] + ++ optional (isLinux && libmfx != null) libmfx ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 738411d398df..d8a13a9c384d 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.1"; - sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c"; + branch = "4.1.2"; + sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 91c384b249a4..a1d623c7b98d 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.8"; + version = "2.8.9"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b"; + sha256 = "1za252d1chv40d78bkjngrg1p2yx0vya8y9q3vqmz66ip2zilvx7"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix new file mode 100644 index 000000000000..6ab10c24d3dc --- /dev/null +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, autoPatchelfHook, cmake, pkgconfig, libdrm, libpciaccess +, libva , libX11, libXau, libXdmcp, libpthreadstubs +}: + +stdenv.mkDerivation rec { + name = "intel-media-sdk-${version}"; + version = "18.4.1"; + + src = fetchurl { + url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; + sha256 = "0yqqw6hyjn28zk4f4wznqpyiz9vinnjj8067dim64bz1f4pjhyra"; + }; + + # patchelf is needed for binaries in $out/share/samples + nativeBuildInputs = [ autoPatchelfHook cmake pkgconfig ]; + buildInputs = [ + libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs + ]; + + enableParallelBuild = true; + + meta = with stdenv.lib; { + description = "Intel Media SDK."; + license = licenses.mit; + maintainers = with maintainers; [ midchildan ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index f7fffa8b2987..6a7720b99bcc 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoconf, automake, libtool }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { name = "libb2-${version}"; - version = "0.98"; + version = "0.98.1"; - src = fetchurl { - url = "https://blake2.net/${name}.tar.gz"; - sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal"; + src = fetchFromGitHub { + owner = "BLAKE2"; + repo = "libb2"; + rev = "v${version}"; + sha256 = "0qj8aaqvfcavj1vj5asm4pqm03ap7q8x4c2fy83cqggvky0frgya"; }; preConfigure = '' @@ -16,14 +18,15 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.hostPlatform.isx86 "--enable-fat=yes"; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; doCheck = true; meta = with stdenv.lib; { description = "The BLAKE2 family of cryptographic hash functions"; + homepage = https://blake2.net/; platforms = platforms.all; - maintainers = with maintainers; [ dfoxfranke ]; + maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; }; } diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 04e1af2326b6..8949ea8e390e 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: +{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2 +, x11Support ? !stdenv.isDarwin, libX11, libXext +}: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,8 +15,16 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] - ++ stdenv.lib.optional stdenv.isDarwin libXext; + configureFlags = [ + (if x11Support then "--enable-x11" else "--disable-x11") + ]; + + NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING"; + + enableParallelBuilding = true; + + propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] + ++ stdenv.lib.optionals x11Support [ libX11 libXext]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 0a36b9bb2ddb..ae12bd03813c 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook asciidoctor pkgconfig xmlto docbook_xml_dtd_45 docbook_xsl libxslt + which ]; buildInputs = @@ -31,7 +32,6 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs test - substituteInPlace configure.ac --replace "which" "${which}/bin/which" substituteInPlace git-version --replace /bin/bash ${stdenv.shell} substituteInPlace git-version-gen --replace /bin/sh ${stdenv.shell} diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index ff7b7a1af1f3..fc753fe76696 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "6.3.3"; + version = "6.4.2"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "1gfi4ghnhzlkdza2ifvg6b2rk5qn0swq7ykphwmwalb166vj2wlx"; + sha256 = "1s9gbznhak4nvpv56v38pgyki37rlmr0rgc1249ahhv0yfbcf74j"; }; nativeBuildInputs = [ gnused python2 ]; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 96b926d3d2b9..4aa33236a9eb 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -2,14 +2,14 @@ autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: stdenv.mkDerivation rec { - name = "libqalculate-${version}"; - version = "2.9.0"; + pname = "libqalculate"; + version = "3.0.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1w4fbcc6hh63dp88fy4wvys6i1ydj7ya50r1l69a64qbzby1w32i"; + sha256 = "0i21c92r94mp03673cvngvqph268ir4j89d5s9qzxgq2zjw5pc8q"; }; outputs = [ "out" "dev" "doc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace libqalculate/Calculator.cc \ --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ - --replace '"gnuplot -"' '"${gnuplot}/bin/gnuplot -"' + --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' '' + stdenv.lib.optionalString stdenv.cc.isClang '' substituteInPlace src/qalc.cc \ --replace 'printf(_("aborted"))' 'printf("%s", _("aborted"))' diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 52f01229c4af..a0ec3b74cc17 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool -, glib, vala, dee, gobject-introspection, libdbusmenu -, gtk3, intltool, gnome-common, python3, icu }: +{ stdenv +, fetchgit +, pkgconfig +, glib +, vala +, dee +, gobject-introspection +, libdbusmenu +, gtk3 +, intltool +, python3 +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "libunity"; - version = "7.1.4"; + version = "unstable-2019-03-19"; - name = "${pname}-${version}"; + outputs = [ "out" "dev" "py" ]; - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz"; - sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij"; + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/libunity"; + rev = "import/7.1.4+19.04.20190319-0ubuntu1"; + sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj"; }; nativeBuildInputs = [ - autoconf - automake - gnome-common + autoreconfHook gobject-introspection intltool - libtool pkgconfig python3 vala @@ -32,17 +38,20 @@ stdenv.mkDerivation rec { gtk3 ]; - propagatedBuildInputs = [ dee libdbusmenu ]; + propagatedBuildInputs = [ + dee + libdbusmenu + ]; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; + preConfigure = '' + intltoolize + ''; configureFlags = [ "--disable-static" - "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides" + "--with-pygi-overrides-dir=${placeholder ''py''}/${python3.sitePackages}/gi/overrides" ]; - NIX_LDFLAGS = "-L${icu}/lib"; - meta = with stdenv.lib; { description = "A library for instrumenting and integrating with all aspects of the Unity shell"; homepage = https://launchpad.net/libunity; diff --git a/pkgs/development/libraries/libxl/default.nix b/pkgs/development/libraries/libxl/default.nix index 471789d3e0f6..44949cf2deb4 100644 --- a/pkgs/development/libraries/libxl/default.nix +++ b/pkgs/development/libraries/libxl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libxl"; - version = "3.8.1"; + version = "3.8.4"; src = fetchurl { url = "http://www.libxl.com/download/${pname}-lin-${version}.tar.gz"; - sha256 = "1zdbahhyhr70s8hygwp43j9z4zmglyrr782hkcm1078yvkr2f2fm"; + sha256 = "0jnvc9ilir3lvs81l6ldnyf6jbfsy7bcs5pkc75qfnvz01y7p6as"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index f28ff1b0a21f..72743efeb8ef 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.13"; + name = "matio-1.5.14"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy"; + sha256 = "0vhzh0idzlm0m28gxsnv1dcfp0229vdj49d749qn4xfdyncbnfhb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index eb737c0757d9..129cc7ed84c3 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,14 +2,14 @@ }: stdenv.mkDerivation rec { - name = "nlohmann_json-${version}"; - version = "3.5.0"; + pname = "nlohmann_json"; + version = "3.6.1"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "1jq522d48bvfrxr4f6jnijwx2dwqfb8w9k636j4kxlg1hka27lji"; + sha256 = "1dgx3j9pb0f52dh73z8dpwdy79bra1qi5vpl66b9inq4gamf813z"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 7501f9ab6f15..0ca382baeca3 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, amtk, gnome3, gtksourceview4, libuchardet, libxml2, pkgconfig }: +, amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: let version = "4.2.0"; pname = "tepl"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation { libxml2 gtksourceview4 libuchardet - gnome3.gtk + gtk3 ]; doCheck = false; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index face797fe2a3..3343f22b7b0b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -10,11 +10,13 @@ in { stumpwm = x:{ overrides = y: (x.overrides y) // { + linkedSystems = []; preConfigure = '' export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; postInstall = '' - export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm '(function stumpwm:stumpwm)'" + export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system stumpwm \ + '(function stumpwm:stumpwm)' '$linkedSystems'" "$out/bin/stumpwm-lisp-launcher.sh" cp "$out/lib/common-lisp/stumpwm/stumpwm" "$out/bin" diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index b37dd413f693..1213120ce1cb 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,43 +1,22 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, - enableGtkSupport ? true # Whether to compile with support for Gtk - # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk2. +{ stdenv, lib, fetchurl, buildDunePackage +, pkgconfig, cairo }: -let - inherit (stdenv.lib) optionals; - version = "0.5"; -in - -stdenv.mkDerivation { - - name = "ocaml${ocaml.version}-cairo2-${version}"; +buildDunePackage rec { + pname = "cairo2"; + version = "0.6"; src = fetchurl { - url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tar.gz"; - sha256 = "1559df74rzh4v7c9hr6phymq1f5121s83q0xy3r83x4apj74dchj"; + url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; + sha256 = "1k2q7ipmddqnd2clybj4qb5xwzzrnl2fxnd6kv60dlzgya18lchs"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild cairo ] - ++ optionals enableGtkSupport [ gtk2 ]; + buildInputs = [ cairo ]; - # lablgtk2 is marked as a propagated build input since loading the - # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as - # well. - propagatedBuildInputs = optionals enableGtkSupport [ lablgtk ]; + doCheck = !stdenv.isDarwin; - createFindlibDestdir = true; - - configurePhase = "ocaml setup.ml -configure --prefix $out" - + (if enableGtkSupport then " --enable-lablgtk2" - else " --disable-lablgtk2"); - - buildPhase = "ocaml setup.ml -build"; - - installPhase = "ocaml setup.ml -install"; - - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' @@ -46,8 +25,7 @@ stdenv.mkDerivation { the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. ''; - license = licenses.lgpl3; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.jirkamarsik ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ jirkamarsik vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 26131d0a98c8..7c6198add622 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,18 +1,10 @@ -{ stdenv,lib, fetchFromGitHub, pkgconfig, ocaml, findlib, dune, gtk3, cairo2 }: +{ lib, fetchFromGitHub, pkgconfig, buildDunePackage, gtk3, cairo2 }: -if !lib.versionAtLeast ocaml.version "4.05" -then throw "lablgtk3 is not available for OCaml ${ocaml.version}" -else - -# This package uses the dune.configurator library -# It thus needs said library to be compiled with this OCaml compiler -let __dune = dune; in -let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; in - -stdenv.mkDerivation rec { +buildDunePackage rec { version = "3.0.beta5"; pname = "lablgtk3"; - name = "ocaml${ocaml.version}-${pname}-${version}"; + + minimumOCamlVersion = "4.05"; src = fetchFromGitHub { owner = "garrigue"; @@ -22,17 +14,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib dune gtk3 ]; + buildInputs = [ gtk3 ]; propagatedBuildInputs = [ cairo2 ]; - buildPhase = "dune build -p ${pname}"; - inherit (dune) installPhase; - meta = { description = "OCaml interface to gtk+-3"; homepage = "http://lablgtk.forge.ocamlcore.org/"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix index 7e8807576eeb..a266e57dd859 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/sourceview3.nix @@ -1,9 +1,8 @@ -{ stdenv, ocaml, gtksourceview, lablgtk3 }: +{ buildDunePackage, gtksourceview, lablgtk3 }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-lablgtk3-sourceview3-${version}"; - buildPhase = "dune build -p lablgtk3-sourceview3"; +buildDunePackage rec { + pname = "lablgtk3-sourceview3"; buildInputs = lablgtk3.buildInputs ++ [ gtksourceview ]; propagatedBuildInputs = [ lablgtk3 ]; - inherit (lablgtk3) src version meta nativeBuildInputs installPhase; + inherit (lablgtk3) src version meta nativeBuildInputs; } diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix new file mode 100644 index 000000000000..b316540e3d05 --- /dev/null +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }: + +assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; + +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-lacaml"; + version = "11.0.3"; + + src = fetchFromGitHub { + owner = "mmottl"; + repo = "lacaml"; + rev = "${version}"; + sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb"; + }; + + buildInputs = + [ ocaml findlib dune base stdio liblapack blas ] ++ + stdenv.lib.optionals stdenv.isDarwin + [ darwin.apple_sdk.frameworks.Accelerate ]; + + inherit (dune) installPhase; + + meta = with stdenv.lib; { + homepage = http://mmottl.github.io/lacaml; + description = "OCaml bindings for BLAS and LAPACK"; + license = licenses.lgpl21Plus; + platforms = ocaml.meta.platforms or []; + maintainers = [ maintainers.rixed ]; + }; +} diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index bb16ac46f991..2a1864093719 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,15 +1,8 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }: +{ lib, fetchFromGitHub, buildDunePackage, czmq, stdint }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "zmq is not available for OCaml ${ocaml.version}" -else - -let __dune = dune; in -let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; -in - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-zmq-${version}"; +buildDunePackage rec { + minimumOCamlVersion = "4.03"; + pname = "zmq"; version = "20180726"; src = fetchFromGitHub { owner = "issuu"; @@ -22,19 +15,14 @@ stdenv.mkDerivation rec { ./ocaml-zmq-issue43.patch ]; - buildInputs = [ ocaml findlib dune czmq ]; + buildInputs = [ czmq ]; propagatedBuildInputs = [ stdint ]; - buildPhase = "dune build -p zmq"; - - inherit (dune) installPhase; - - meta = with stdenv.lib; { + meta = { description = "ZeroMQ bindings for OCaml"; - license = licenses.mit; - maintainers = with maintainers; [ akavel ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ akavel ]; inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix new file mode 100644 index 000000000000..6fe41e404192 --- /dev/null +++ b/pkgs/development/python-modules/Markups/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-markdown-math +, markdown +, docutils +, pygments +}: + +buildPythonPackage rec { + pname = "Markups"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39"; + }; + + checkInputs = [ markdown docutils pygments ]; + propagatedBuildInputs = [ python-markdown-math ]; + + meta = { + description = "A wrapper around various text markup languages."; + homepage = https://github.com/retext-project/pymarkups; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ klntsky ]; + }; +} diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 1ec50ef7780b..dff12fcaf92c 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.7.8"; + version = "2.7.9"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "11yx7vd0mp5gkq428af141dwnrwf8f9cp3f65243qbs9icjxnrrx"; + sha256 = "19vyf60zfmnv7frwm96bzqzvia69dysy9apk8bl84vr03ib9vrbf"; }; prePatch = '' diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 0ba779ec93e5..90fe66bf4e92 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "astropy"; - version = "3.1.1"; + version = "3.1.2"; disabled = !isPy3k; # according to setup.py @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0fzm2q922qi68ns5biy807dzmgz1i9gqdh73lcafs0gfk8zyc9v5"; + sha256 = "1plyx3gcsff02g4yclvhlcdj8bh1lnm98d7h6wdabl36jvnahy2a"; }; propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index cf619e6021ef..8906b72dcca0 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.8.4"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "7016dc02d15b8797b59a461ccc8d218f37c335b97fa6b376638c0edd4ffc9de2"; + sha256 = "0a53c484za2l4yy1i05qhkylvygg8fnh4j1v3n35x2dsi929awdp"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index cd98a8da710a..268c08ced848 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, +{ stdenv, lib, buildPythonPackage, /*fetchPypi,*/ fetchFromGitHub, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, future, sqlalchemy, sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, - isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }: + isort, pylint, flake8, buildbot-worker, buildbot-pkg, parameterized, + glibcLocales }: let withPlugins = plugins: buildPythonPackage { @@ -24,12 +25,21 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "1.8.1"; + version = "2.1.0"; - src = fetchPypi { + /*src = fetchPypi { inherit pname version; - sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7"; - }; + sha256 = "1745hj9s0c0fcdjv6w05bma76xqg1fv42v0dslmi4d8yz9phf37w"; + };*/ + # Temporarily use GitHub source because PyPi archive is missing some files + # needed for the tests to pass. This has been fixed upstream. + # See: https://github.com/buildbot/buildbot/commit/30f5927cf9a80f98ed909241a149469dec3ce68d + src = fetchFromGitHub { + owner = "buildbot"; + repo = "buildbot"; + rev = "v${version}"; + sha256 = "022ybhdvp0hp2z0cwgx7n41jyh56bpxj3fwm4z7ppzj1qhm7lb65"; + } + "/master"; propagatedBuildInputs = [ # core @@ -63,6 +73,7 @@ let flake8 buildbot-worker buildbot-pkg + parameterized glibcLocales ]; @@ -84,6 +95,8 @@ let export PATH="$out/bin:$PATH" ''; + disabled = !isPy3k; + passthru = { inherit withPlugins; }; diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 480bed2805ee..35524040da99 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "buildbot-pkg"; - version = "1.8.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3"; + sha256 = "03lv97q4pp2izjfbwfv4zmf2fyiz7jyp537bi3gc6rhfbrfgib1i"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 4bcaa965d2f3..2f73fbc81a4f 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -10,7 +10,8 @@ src = fetchPypi { inherit pname version format; - sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl"; + python = "py3"; + sha256 = "011sagw8zp1z12vzkxi44w3w2lbxncz5yahkrbxj8hp6iwfzfm5v"; }; meta = with lib; { @@ -27,7 +28,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824"; + sha256 = "11gz4ry1law3l64ii383cj5fnbw9409czp2ybzkqafr4xi1qbk9h"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -47,7 +48,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz"; + sha256 = "0w4iwpj1rg20fbli0ppqz70l1mc9ilg0crq8g3xrf29f9z8d1w27"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -67,7 +68,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5"; + sha256 = "0xyvxamw45qhnfml3x5hfg9nai1jhdwbmq4pm8csf3ad0cw6vqya"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -87,7 +88,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d"; + sha256 = "1szcrx8vslskifzxaq7lrfg2arilaq1w1aqr0nc8pjclj7idp92c"; }; propagatedBuildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 8e49d085fbd1..f888448db218 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -2,11 +2,11 @@ buildPythonPackage (rec { pname = "buildbot-worker"; - version = "1.8.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39"; + sha256 = "14qimaf513h2hklcpix8vscrawvr1qiyn1vy88ycpsbz9mcqbhps"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index 64f649ad28ab..3fc4c3e84ed4 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -25,12 +25,19 @@ buildPythonPackage rec { -k "not test_nightshade_image" ''; - buildInputs = [ cython glibcLocales ]; - LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ + cython + geos # for geos-config + proj + ]; + + buildInputs = [ + geos proj + ]; propagatedBuildInputs = [ # required - six pyshp shapely geos proj numpy + six pyshp shapely numpy # optional gdal pillow matplotlib pyepsg pykdtree scipy fiona owslib diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 381c114b44e4..45a9920dbe2e 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner, pytestcov, pytest-flake8, pytest-isort, glibcLocales }: +{ lib, buildPythonPackage, fetchPypi, tinycss2, pytest, pytestrunner }: buildPythonPackage rec { pname = "cssselect2"; @@ -9,11 +9,21 @@ buildPythonPackage rec { sha256 = "505d2ce3d3a1d390ddb52f7d0864b7efeb115a5b852a91861b498b92424503ab"; }; + # We're not interested in code quality tests + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-cov" "" \ + --replace "pytest-flake8" "" \ + --replace "pytest-isort" "" + substituteInPlace setup.cfg \ + --replace "--cov=cssselect2" "" \ + --replace "--flake8" "" \ + --replace "--isort" "" + ''; + propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort glibcLocales ]; - - LC_ALL = "en_US.UTF-8"; + checkInputs = [ pytest pytestrunner ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index f227ed99bc9a..0f4c559bd16b 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.9.1"; + version = "3.9.2"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66"; + sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix new file mode 100644 index 000000000000..15c771ebaf52 --- /dev/null +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -0,0 +1,20 @@ +{ lib, python, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "dnslib"; + version = "0.9.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w8spp4fnw63xx9zj77zvgk1qabd97ifrj6gap2j36gydnarr42c"; + }; + + checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; + + meta = with lib; { + description = "Simple library to encode/decode DNS wire-format packets"; + license = licenses.bsd2; + homepage = https://bitbucket.org/paulc/dnslib/; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 5709b17c524a..8099f3318e86 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flake8-import-order"; - version = "0.18"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "9be5ca10d791d458eaa833dd6890ab2db37be80384707b0f76286ddd13c16cbf"; + sha256 = "14kfvsagqc6lrplvf3x58ia6x744bk8fj91wmk0hcipa8naw73d2"; }; propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index fe4cf01a8dfe..b207e7ca239e 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f9c79fc295b8b20cfda5ab0a671e72c95615dc77517ae414f8f8b10e9375f155"; + sha256 = "0ggac8a8qk06wplwg5xsisn9id3lis9qslri7m9rz22khlyl7z4j"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index 672704249dc9..b422b368ffb6 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools_scm }: +, setuptools_scm, jaraco_collections +}: buildPythonPackage rec { pname = "irc"; @@ -23,5 +24,6 @@ buildPythonPackage rec { jaraco_stream pytz jaraco_itertools + jaraco_collections ]; } diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 5a7e50d43322..bb9958a6fef1 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -1,22 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }: +{ lib, buildPythonPackage, fetchPypi, isPy27, futures, backports_functools_lru_cache, mock, pytest }: -buildPythonPackage rec { +let + skipTests = lib.optional isPy27 "test_standard_library_deprecates_user_issue_778"; + testOpts = lib.concatMapStringsSep " " (t: "--deselect test_isort.py::${t}") skipTests; +in buildPythonPackage rec { pname = "isort"; - version = "4.3.4"; + version = "4.3.16"; # Note 4.x is the last version that supports Python2 src = fetchPypi { inherit pname version; - sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r"; + sha256 = "1v6lapqhc33rxr9698lqjyb49fis27i42p3ymngrw95py3qf7y08"; }; - propagatedBuildInputs = lib.optional isPy27 futures; + propagatedBuildInputs = lib.optionals isPy27 [ futures backports_functools_lru_cache ]; checkInputs = [ mock pytest ]; + # isort excludes paths that contain /build/, so test fixtures don't work with TMPDIR=/build/ checkPhase = '' - py.test test_isort.py -k "not test_long_line_comments \ - and not test_import_case_produces_inconsistent_results_issue_472 \ - and not test_no_extra_lines_issue_557" + PATH=$out/bin:$PATH TMPDIR=/tmp/ pytest ${testOpts} ''; meta = with lib; { diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index c0b30edb9ad4..8fde41e9b499 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage, fetchPypi, setuptools_scm -, six, jaraco_classes }: +, six, jaraco_classes, jaraco_text +}: buildPythonPackage rec { pname = "jaraco.collections"; @@ -11,7 +12,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ six jaraco_classes ]; + propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; # break dependency cycle patchPhase = '' diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..43530fcc3285 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,38 @@ +From fcffcc61e432e5250e7fbfb1ecbe0f1cac3006cf Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sun, 10 Mar 2019 13:10:18 +0100 +Subject: [PATCH] Don't run flake8 checks during the build + +If the code simply violates their code style, the Nix package shouldn't fail. +--- + pytest.ini | 2 +- + setup.cfg | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pytest.ini b/pytest.ini +index d165e5e..d8e4694 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES + filterwarnings= + ignore:Possible nested set::pycodestyle:113 +diff --git a/setup.cfg b/setup.cfg +index 9f3517f..c9033ec 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,7 +30,6 @@ setup_requires = setuptools_scm >= 1.15.0 + testing = + pytest >= 3.5, !=3.7.3 + pytest-checkdocs +- pytest-flake8 + docs = + sphinx + jaraco.packaging >= 3.2 +-- +2.18.1 + diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 4057d7ad2758..cbf966785e17 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, inflect, more-itertools, six, pytest, pytest-flake8 }: +, inflect, more-itertools, six, pytest +}: buildPythonPackage rec { pname = "jaraco.itertools"; @@ -10,9 +11,11 @@ buildPythonPackage rec { sha256 = "d1380ed961c9a4724f0bcca85d2bffebaa2507adfde535d5ee717441c9105fae"; }; + patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch new file mode 100644 index 000000000000..aab9604b9ce8 --- /dev/null +++ b/pkgs/development/python-modules/jaraco_logging/0001-Don-t-run-flake8-checks-during-the-build.patch @@ -0,0 +1,38 @@ +From 4b9801d9bbe535fd6719933b96278915573e3595 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sun, 10 Mar 2019 16:42:21 +0100 +Subject: [PATCH] Don't run flake8 checks during the build + +If the code simply violates their code style, the Nix package shouldn't fail. +--- + pytest.ini | 2 +- + setup.cfg | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/pytest.ini b/pytest.ini +index 9b3c1ec..a5189c1 100644 +--- a/pytest.ini ++++ b/pytest.ini +@@ -1,6 +1,6 @@ + [pytest] + norecursedirs=dist build .tox .eggs +-addopts=--doctest-modules --flake8 ++addopts=--doctest-modules + doctest_optionflags=ALLOW_UNICODE ELLIPSIS + filterwarnings= + ignore:Possible nested set::pycodestyle:113 +diff --git a/setup.cfg b/setup.cfg +index 3e7bbed..5cac7a2 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -29,7 +29,6 @@ setup_requires = setuptools_scm >= 1.15.0 + testing = + pytest >= 3.5, !=3.7.3 + pytest-checkdocs +- pytest-flake8 + docs = + sphinx + jaraco.packaging >= 3.2 +-- +2.18.1 + diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 68fba6bfb5fb..ae05a76da1d5 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, setuptools_scm -, tempora, six, pytest, pytest-flake8 }: +, tempora, six, pytest +}: buildPythonPackage rec { pname = "jaraco.logging"; @@ -10,9 +11,11 @@ buildPythonPackage rec { sha256 = "1lb846j7qs1hgqwkyifv51nhl3f8jimbc4lk8yn9nkaynw0vyzcg"; }; + patches = [ ./0001-Don-t-run-flake8-checks-during-the-build.patch ]; + buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ tempora six ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ pytest ]; checkPhase = '' PYTHONPATH=".:$PYTHONPATH" pytest diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index 222a92e60fb6..6087258a289b 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -1,14 +1,15 @@ { buildPythonPackage, fetchPypi, setuptools_scm -, jaraco_functools, jaraco_collections }: +, jaraco_functools +}: buildPythonPackage rec { pname = "jaraco.text"; - version = "2.0"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "3660678d395073626e72a455b24bacf07c064138a4cc6c1dae63e616f22478aa"; + sha256 = "1l5hq2jvz9xj05aayc42f85v8wx8rpi16lxph8blw51wgnvymsyx"; }; doCheck = false; buildInputs =[ setuptools_scm ]; - propagatedBuildInputs = [ jaraco_functools jaraco_collections ]; + propagatedBuildInputs = [ jaraco_functools ]; } diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index d96752ba05f3..f9f5ba23eac9 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi +, fetchpatch , sphinx , numpydoc , pytest @@ -10,16 +11,30 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.12.4"; + version = "0.13.2"; - # get full repository inorder to run tests - src = fetchFromGitHub { - owner = "joblib"; - repo = pname; - rev = version; - sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb"; + src = fetchPypi { + inherit pname version; + sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524"; }; + # python-lz4 compatibility + # https://github.com/joblib/joblib/pull/847 + patches = [ + (fetchpatch { + url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch; + sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h"; + }) + (fetchpatch { + url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch; + sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba"; + }) + (fetchpatch { + url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch; + sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d"; + }) + ]; + checkInputs = [ sphinx numpydoc pytest ]; propagatedBuildInputs = [ python-lz4 ]; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 4619400b6e35..37c999e86b4c 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -16,8 +16,13 @@ buildPythonPackage rec { sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; + nativeBuildInputs = with pkgs; [ + swig1 coin3d soqt + ]; + buildInputs = with pkgs; with xorg; [ - swig1 coin3d soqt libGLU_combined + coin3d soqt + libGLU_combined libXi libXext libSM libICE libX11 ]; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 5f43ae32ea23..d8f3c01bbd48 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -5,6 +5,10 @@ , requests , pytz , tzlocal +, i3ipc +, pydbus +, pygobject3 +, pyserial , file , acpi @@ -20,14 +24,14 @@ buildPythonPackage rec { pname = "py3status"; version = "3.16"; - + src = fetchPypi { inherit pname version; sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g"; }; doCheck = false; - propagatedBuildInputs = [ pytz requests tzlocal ]; + propagatedBuildInputs = [ pytz requests tzlocal i3ipc pydbus pygobject3 pyserial ]; buildInputs = [ file ]; prePatch = '' sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 899b18eecbed..32c5f38b66d0 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -16,6 +16,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pandas pytest ]; PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; PYARROW_CMAKE_OPTIONS = [ "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" @@ -24,6 +25,10 @@ buildPythonPackage rec { "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; + preCheck = '' rm pyarrow/tests/test_jvm.py rm pyarrow/tests/test_hdfs.py @@ -43,13 +48,15 @@ buildPythonPackage rec { # when it is not intended to be imported at all rm pyarrow/tests/deserialize_buffer.py substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" + + # Fails to bind a socket + # "PermissionError: [Errno 1] Operation not permitted" + substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled" ''; ARROW_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp; - setupPyBuildFlags = ["--with-parquet" ]; - checkPhase = '' mv pyarrow/tests tests rm -rf pyarrow diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix new file mode 100644 index 000000000000..ac4af42851cd --- /dev/null +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +# Runtime inputs: +, pyparsing +# Check inputs: +, pytest +, mock +}: + +buildPythonPackage rec { + pname = "pyhocon"; + version = "0.3.51"; + + src = fetchPypi { + inherit pname version; + sha256 = "10l014br012fa583rnj3wqf6g9gmljamcwpw4snqwwg15i0dmkll"; + }; + + propagatedBuildInputs = [ pyparsing ]; + + checkInputs = [ pytest mock ]; + + # Tests fail because necessary data files aren't packaged for PyPi yet. + # See https://github.com/chimpler/pyhocon/pull/203 + doCheck = false; + + meta = with lib; { + homepage = https://github.com/chimpler/pyhocon/; + description = "HOCON parser for Python"; + # Long description copied from + # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py + # (the tip of master as of 2019-03-24). + longDescription = '' + A HOCON parser for Python. It additionally provides a tool + (pyhocon) to convert any HOCON content into json, yaml and properties + format + ''; + license = licenses.asl20; + maintainers = [ maintainers.chreekat ]; + }; +} diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index b58e1f48bb80..17d60f7507d3 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.0"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "049xj760s75nkvs7rhz710a6x3lvvfajddknmfz1vkf2p3f2l2as"; + sha256 = "1h75a5fisqqj48m6wq7jhdxv6arjg3mvnr5q404pvfbjscj7yp76"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index abb0bdebd5da..e23e63525183 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -13,7 +13,11 @@ buildPythonPackage rec { enableParallelBuilding = true; - buildInputs = [ cmake pyside qt4 pysideShiboken ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 ]; + + propagatedBuildInputs = [ pyside pysideShiboken ]; meta = { description = "Tools for pyside, the LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix index 852de1fd49cd..f9e6846367c3 100644 --- a/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ b/pkgs/development/python-modules/pytest-faulthandler/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d"; }; - buildInputs = [ setuptools_scm pytest ]; + nativeBuildInputs = [ setuptools_scm pytest ]; checkInputs = [ pytest-mock ]; propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 6a70b6e8ce97..4fd0570a50dc 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4"; + sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix new file mode 100644 index 000000000000..053b4897e833 --- /dev/null +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, markdown +}: + +buildPythonPackage rec { + pname = "python-markdown-math"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "c68d8cb9695cb7b435484403dc18941d1bad0ff148e4166d9417046a0d5d3022"; + }; + + checkInputs = [ markdown ]; + + meta = { + description = "Math extension for Python-Markdown"; + homepage = https://github.com/mitya57/python-markdown-math; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ klntsky ]; + }; +} diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index 598767e6ca9b..fc4c192968f2 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.5"; + version = "3.4.6"; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "1rflyc6q3wa5ghc5v81yw79yg7lkpgd2c22mgbb0cvza724k53ys"; + sha256 = "15b58nj45bdax0aha6kwjz5pxj3bz8bs6ajwxqp9r89j13xxn94g"; }; doCheck = true; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index eeed42892308..4522c7623283 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -9,14 +9,11 @@ buildPythonPackage rec { pname = "restructuredtext_lint"; - version = "1.2.2"; - - # https://github.com/twolfson/restructuredtext-lint/pull/47 - disabled = isPy37; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "82880a8de8a41bfc84f533744091b1ead8e2ab9ad6c0a3f60f4750ef6c802350"; + sha256 = "97b3da356d5b3a8514d8f1f9098febd8b41463bed6a1d9f126cf0a048b6fd908"; }; checkInputs = [ nose testtools ]; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index b2c63ea97e3b..c1791db9fbc9 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.2.8"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "115k1z2klgsvyzg4q5ip0iqxyb565pkchhf2fsr846k68gqcgrjn"; + sha256 = "116r78nhw74rh857kv9l614xjr6k89919s6l8b14hlvy8fz8rg51"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 0fde898ca04f..bf57b9846ee5 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.10.4"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4"; + sha256 = "0kjcyw3xmps3maf4vzn1pypc6i60q8b67xj78v4gbv4yx2cp2fzr"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index 2b0ff6e443a7..b41633da4d39 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snakeviz"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5fe23667708a4ed04047abfbf209675a8488ea6ea8c038d7de06d8a083fb3531"; + sha256 = "0hvfc7c25cz6p3m3p3klm3njiysp7lkrs9sxm4p40spldl0jlfpa"; }; # Upstream doesn't run tests from setup.py diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 68d097d71d6a..79f0fb13d70d 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3 }: +, wrapGAppsHook, gobject-introspection, pygobject3, graphviz, gnome3, gtk3 }: buildPythonPackage rec { pname = "xdot"; @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gnome3.gtk ]; + propagatedBuildInputs = [ gobject-introspection pygobject3 graphviz gtk3 ]; meta = with lib; { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix new file mode 100644 index 000000000000..86748b716e6e --- /dev/null +++ b/pkgs/development/tools/bazelisk/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "bazelisk"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "philwo"; + repo = pname; + rev = "v${version}"; + sha256 = "1rkpw9izpav3ysb9fpbdf0m1wqrs3vl87s9zjjmfsjm5dfhxss72"; + }; + + modSha256 = "1f73j6ryidzi3kfy3rhsqx047vzwvzaqcsl7ykhg87rn2l2s7fdl"; + + meta = with stdenv.lib; { + description = "A user-friendly launcher for Bazel"; + homepage = https://github.com/philwo/bazelisk; + license = licenses.asl20; + maintainers = with maintainers; [ elasticdog ]; + }; +} diff --git a/pkgs/development/tools/cadre/Gemfile b/pkgs/development/tools/cadre/Gemfile new file mode 100644 index 000000000000..aa42f75c95cf --- /dev/null +++ b/pkgs/development/tools/cadre/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'cadre', '=1.0.4' diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/development/tools/cadre/Gemfile.lock new file mode 100644 index 000000000000..c14df9cffa61 --- /dev/null +++ b/pkgs/development/tools/cadre/Gemfile.lock @@ -0,0 +1,19 @@ +GEM + remote: https://rubygems.org/ + specs: + cadre (1.0.4) + thor (>= 0.14, < 1.0) + tilt (> 1.0) + valise (~> 1.2) + thor (0.20.3) + tilt (2.0.9) + valise (1.2.1) + +PLATFORMS + ruby + +DEPENDENCIES + cadre (= 1.0.4) + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/development/tools/cadre/default.nix new file mode 100644 index 000000000000..93eb32cfb514 --- /dev/null +++ b/pkgs/development/tools/cadre/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp { + pname = "cadre"; + gemdir = ./.; + exes = [ "cadre" ]; + + meta = with lib; { + description = "Toolkit to add Ruby development - in-editor coverage, libnotify of test runs"; + homepage = https://github.com/nyarly/cadre; + license = licenses.mit; + maintainers = [ maintainers.nyarly ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cadre/gemset.nix b/pkgs/development/tools/cadre/gemset.nix new file mode 100644 index 000000000000..33fd428debf2 --- /dev/null +++ b/pkgs/development/tools/cadre/gemset.nix @@ -0,0 +1,35 @@ +{ + cadre = { + dependencies = ["thor" "tilt" "valise"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07q60s1bm2xar46g00ls5fjkn6dm2kfxhsz9ayblc31x5kr8d83a"; + type = "gem"; + }; + version = "1.0.4"; + }; + thor = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; + }; + valise = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1arsbmk2gifrhv244qrld7s3202xrnxy6vlc5gqklg70dpsinbn5"; + type = "gem"; + }; + version = "1.2.1"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index f44e76c0b8e5..aa262fd54952 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.8.0"; + version = "11.9.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1g9r0ny25r4iv7m5jf8fbfak4rhlcz7mm3x7mwwpmiyhnjbwz08s"; + sha256 = "1la4pkf8xp5h75dlvb6w7ijczrnci3bmbl77h3y4jicz555jjir3"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "07xg46dl2d0scb7hqn5gcg3g4icr28z03n3q2rgqckn4782ha2s1"; + sha256 = "1axn34aqa17yk2c2vy73fb8ab3nc3021dzj0vk95qificlmj3par"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0jvhlcxlxpam2hr9gh0zcjgl04is3rm0lkm94v4m6wk9yxknx3wp"; + sha256 = "1b4r83glx0n3l060k33s397dw5dpajlxb880yzwsb11hvc6cs39h"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix index ed650f37698a..14d07a0108fa 100644 --- a/pkgs/development/tools/easyjson/default.nix +++ b/pkgs/development/tools/easyjson/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "easyjson-unstable-${version}"; - version = "2018-08-23"; + version = "2019-02-21"; goPackagePath = "github.com/mailru/easyjson"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "mailru"; repo = "easyjson"; - rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + rev = "6243d8e04c3f819e79757e8bc3faa15c3cb27003"; + sha256 = "160sj5pq4bv9jshniimkd5f9zcg6xrbgb027lhr9l895nsv4dlib"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix index 3ba1d12a8048..0429d8876b29 100644 --- a/pkgs/development/tools/easyjson/deps.nix +++ b/pkgs/development/tools/easyjson/deps.nix @@ -1,3 +1,3 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ ] diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index b0069d3488e0..85e7c07b8cce 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gocode-gomod-unstable-${version}"; - version = "2018-10-16"; - rev = "12640289f65065d652cc942ffa01a52bece1dd53"; + version = "2019-02-12"; + rev = "8cc90faaf4765d16de060350da41eadccc1a15d1"; goPackagePath = "github.com/stamblerre/gocode"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "stamblerre"; repo = "gocode"; - sha256 = "1avv0b5p2l8pv38m5gg97k57ndr5k9yy0rfkmmwjq96pa221hs1q"; + sha256 = "0y5lc7sq3913mvvczwx8mq5l3l9yg34jzaw742q8jpd1jzqyza94"; }; goDeps = ./deps.nix; @@ -45,6 +45,6 @@ buildGoPackage rec { homepage = https://github.com/stamblerre/gocode; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit rvolosatovs ]; }; } diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index cf3b0414c7a3..b8071bf1ac26 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { - name = "k6-${version}"; - version = "0.23.1"; +buildGoPackage rec { + pname = "k6"; + version = "0.24.0"; goPackagePath = "github.com/loadimpact/k6"; src = fetchFromGitHub { owner = "loadimpact"; - repo = "k6"; + repo = pname; rev = "v${version}"; - sha256 = "03krrpbb67h9hmrg5m94936kha667yh2lqzp9s7fv0b6khskr9r7"; + sha256 = "1riyyi4lxdaqilzzkxzzw3hzcrjjcylq2jh3p3656f99wiisvj28"; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 231a2009491f..d142078c50fa 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "lazygit-${version}"; - version = "0.5"; + version = "0.7.2"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = "lazygit"; rev = "v${version}"; - sha256 = "0xgda2b5p26ya15kq83502f8vh18kl05hl40k0lsfqx3m7pnidn1"; + sha256 = "1b5mzmxw715cx7b0n22hvrpk0dbavzypljc7skwmh8k1nlx935jj"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index 9784308b010e..c4164b414331 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -2,11 +2,11 @@ python2.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.7.1"; + version = "0.8.0"; src = python2.pkgs.fetchPypi { inherit pname version; - sha256 = "ecef2833aef7f411cb923dac109c7c9dcc7dbe7cafce0650c1e8d19c243d955f"; + sha256 = "0lwx1w1vk3a0pc237chwycl8qc6lwq8bzf13036wnmk74m9kwi7c"; }; # Non-standard test suite. Needs custom checkPhase. diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index 5a9642057d8a..43d86966694f 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pkgconf-1.6.0"; + pname = "pkgconf"; + version = "1.6.1"; src = fetchurl { - url = "https://distfiles.dereferenced.org/pkgconf/${name}.tar.xz"; - sha256 = "1rgcw7lbmxv45y4ybnlh1wzhd1d15d2616499ajjnrvnnnms6db1"; + url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1310va0nm8iyb4ghgz9qlx7qb00iha1523hq1zbgj0c98cwfxf92"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index be7a488e96e8..80aeb17bef31 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, opaline }: +{ stdenv, fetchurl, ocaml, findlib, opaline }: stdenv.mkDerivation rec { name = "dune-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = [ ocaml findlib ]; buildFlags = "release"; @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "A composable build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.mit; - inherit (ocamlPackages.ocaml.meta) platforms; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index b3e9e71ebc05..a7f06e734530 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 537997eb8a45..59a1cd223b5d 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -114,7 +114,7 @@ print <<'EOF'; makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ - --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/store + --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix index e283c162092a..9292d124545a 100644 --- a/pkgs/development/tools/quicktemplate/default.nix +++ b/pkgs/development/tools/quicktemplate/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "quicktemplate-unstable-${version}"; - version = "2018-11-26"; + version = "2019-01-31"; goPackagePath = "github.com/valyala/quicktemplate"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "valyala"; repo = "quicktemplate"; - rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; - sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; + rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; + sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index ad23ed7e9dc4..21068a8b05f6 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "stagit-${version}"; - version = "0.6"; + version = "0.9.1"; src = fetchgit { url = git://git.codemadness.org/stagit; rev = version; - sha256 = "1xwjdqkf5akxa66ak7chd9gna89kgbdzjrpx4ch7f770ycp2s5sr"; + sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/development/tools/statik/default.nix b/pkgs/development/tools/statik/default.nix new file mode 100644 index 000000000000..0ad7d7f78d4a --- /dev/null +++ b/pkgs/development/tools/statik/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "statik-unstable-${version}"; + version = "2018-11-28"; + goPackagePath = "github.com/rakyll/statik"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "rakyll"; + repo = "statik"; + rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; + sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://github.com/rakyll/statik"; + description = "Embed files into a Go executable "; + license = licenses.asl20; + maintainers = with maintainers; [ chiiruno ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/statik/deps.nix b/pkgs/development/tools/statik/deps.nix new file mode 100644 index 000000000000..0429d8876b29 --- /dev/null +++ b/pkgs/development/tools/statik/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ +] diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index c147bfb77ad7..3865d8fbef9e 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -3,16 +3,16 @@ stdenv.mkDerivation rec { name = "stunt-rally-${version}"; - version = "2.6"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz"; - sha256 = "1jmsxd2isq9q5paz43c3xw11vr5md1ym8h34b768vxr6gp90khwc"; + sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v"; }; tracks = fetchurl { url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz"; - sha256 = "0yv88l9s03kp1xkkwnigh0jj593vi3r7vgyg0jn7i8d22q2p1kjb"; + sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs"; }; # include/OGRE/OgreException.h:265:126: error: invalid conversion from @@ -22,14 +22,10 @@ stdenv.mkDerivation rec { preConfigure = '' pushd data tar xf ${tracks} - mv tracks-2.6 tracks + mv tracks-${version} tracks popd ''; - patches = [ - ./gcc6.patch - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal diff --git a/pkgs/games/stuntrally/gcc6.patch b/pkgs/games/stuntrally/gcc6.patch deleted file mode 100644 index 6632ea4e8856..000000000000 --- a/pkgs/games/stuntrally/gcc6.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git i/source/ogre/CarModel_Create.cpp w/source/ogre/CarModel_Create.cpp -index 834eac7..47ec647 100644 ---- i/source/ogre/CarModel_Create.cpp -+++ w/source/ogre/CarModel_Create.cpp -@@ -130,7 +130,8 @@ void CarModel::Load(int startId) - - /// load config .car - string pathCar; -- pApp->gui->GetCarPath(&pathCar, 0, 0, sDirname, pApp->mClient); // force orig for newtorked games -+ string empty; -+ pApp->gui->GetCarPath(&pathCar, &empty, &empty, sDirname, bool(pApp->mClient)); // force orig for newtorked games - LoadConfig(pathCar); - - -diff --git i/source/ogre/Gui_Tweak.cpp w/source/ogre/Gui_Tweak.cpp -index 76ed8e9..9444271 100644 ---- i/source/ogre/Gui_Tweak.cpp -+++ w/source/ogre/Gui_Tweak.cpp -@@ -412,8 +412,8 @@ bool CGui::GetCarPath(std::string* pathCar, - pathUserD = PATHMANAGER::CarSimU() + "/" + pSet->game.sim_mode + "/cars/", - pathUser = pathUserD + file; - -- if (pathSave) *pathSave = pathUser; -- if (pathSaveDir) *pathSaveDir = pathUserD; -+ if (pathSave != "") *pathSave = pathUser; -+ if (pathSaveDir != "") *pathSaveDir = pathUserD; - - if (!forceOrig && PATHMANAGER::FileExists(pathUser)) - { -diff --git i/source/vdrift/cartire.cpp w/source/vdrift/cartire.cpp -index dd6dd48..083fa0c 100644 ---- i/source/vdrift/cartire.cpp -+++ w/source/vdrift/cartire.cpp -@@ -3,6 +3,7 @@ - #include "cardefs.h" - //#include "../ogre/common/Def_Str.h" - -+using namespace std; - - void CARTIRE::FindSigmaHatAlphaHat(Dbl load, Dbl & output_sigmahat, Dbl & output_alphahat, int iterations) - { -diff --git i/source/vdrift/model_obj.cpp w/source/vdrift/model_obj.cpp -index 338d122..e67c1db 100644 ---- i/source/vdrift/model_obj.cpp -+++ w/source/vdrift/model_obj.cpp -@@ -205,7 +205,7 @@ bool MODEL_OBJ::Save(const std::string & strFileName, std::ostream & error_outpu - std::ofstream f(strFileName.c_str()); - if (!f) - { -- error_output << "Error opening file for writing: " << error_output << endl; -+ error_output << "Error opening file for writing: " << endl; - return false; - } - -diff --git i/source/vdrift/texture.h w/source/vdrift/texture.h -index b21846a..c115fd6 100644 ---- i/source/vdrift/texture.h -+++ w/source/vdrift/texture.h -@@ -125,7 +125,7 @@ class TEXTURELIBRARY - bool FileExists(const std::string & filename) - { - std::ifstream f(filename.c_str()); -- return f; -+ return bool(f); - } - - public: diff --git a/pkgs/misc/themes/solarc/default.nix b/pkgs/misc/themes/solarc/default.nix new file mode 100644 index 000000000000..55cd6e1dac04 --- /dev/null +++ b/pkgs/misc/themes/solarc/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, + gtk-engine-murrine, gtk3 +}: + +stdenv.mkDerivation rec { + name = "solarc-gtk-theme-${version}"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "schemar"; + repo = "solarc-theme"; + rev = "d1eb117325b8e5085ecaf78df2eb2413423fc643"; + sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s"; + }; + + nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ]; + + buildPhase = '' + ./autogen.sh --prefix=$out + ''; + + meta = with stdenv.lib; { + description = "Solarized version of the Arc theme"; + homepage = https://github.com/schemar/solarc-theme; + license = licenses.gpl3; + maintainers = [ maintainers.bricewge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fdc207b933c0..dddb99f75d63 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-03-17"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "885ca6711b25d77ef69f9704c847d940ceae41c9"; - sha256 = "0f5s51axdpwl5f041rxdl53h5ldysf80kqkx79hkx9f6022b80z5"; + rev = "3e5bfab6bd773b3270800cfc30d830a8b7a992e0"; + sha256 = "18c78gq49ijcc9gml35xfns8gbafpfn6n3vz4vzg4pigpmnf7f71"; }; }; @@ -494,12 +494,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-03-17"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "a6ed6a909a238b1583b84496c60075f474421973"; - sha256 = "0s7qg4kzvj1sdc9b9adnxk4x0svnaxa6n7b2slajbbkxpj3bc1pi"; + rev = "78d29a3539adf21e862ceeba3659d176ba0bfeb1"; + sha256 = "0svprrdslsdwm6mfara6ffmpskvgxn55lyyv57sk0va0rasbx543"; }; }; @@ -584,12 +584,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-03-04"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "440ee9e14fc854cf5aeb0971e4ab8b9f5204fcb0"; - sha256 = "0dyw4d103h9cwxr2z19c6mj5sxprb47p865vknrf4yny9sdrqrcd"; + rev = "2db6bb451669c145079500d8f9176ba50f433a8a"; + sha256 = "04ssiwnd8chha6ajmqsfzpx80xilfd0l4f6jdhli9kr361p0p264"; }; }; @@ -838,23 +838,23 @@ let iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; - version = "2018-08-26"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "neutaaaaan"; repo = "iosvkem"; - rev = "ac6ad259a5aa8be243d5e343d231942b026f1ec1"; - sha256 = "15ci15drs93qphmga0rr79hrlggrgmaia099j7n59sllhqn5zfbm"; + rev = "e552c65165b42df79d462d9222ae022116bdb26a"; + sha256 = "0va122hl4lilakvc0ww59p5nqddj9fb9gk0hi68885fygqz0l6n5"; }; }; jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-02-24"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "1f7e661d9d29fa1485e781eaa97a4491f952e316"; - sha256 = "1x96bjw25kmwgi86h0ama4xl6qrbyk7yia5fiw9qkicy1j7yk7j1"; + rev = "f26b2a8802ad47406a0ab1e7b68234fa22d88891"; + sha256 = "01bbs70j5z00rn4bmf05zvl3mavyv8w6faj59z0mldvxnfidw2bb"; fetchSubmodules = true; }; }; @@ -1103,12 +1103,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-03-13"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "f9c53c383596b2c12d0bba87ab92bb67042eca33"; - sha256 = "1avgffzc5dxs783kr0nvb2fr6vc8vy4ypqlk74vlfq534gkky68a"; + rev = "d8f9aa8dcfd131818d9abd725c3a49c7046edb5b"; + sha256 = "1ffj9qvq5qbfwdszp35zyc4x1cmd9pj50h6x8fpjcl0wfx8pd695"; }; }; @@ -1125,12 +1125,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-03-16"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "716a6a44a7d6d80cb2e5f90220d31bf25b960e68"; - sha256 = "0n6ppv3m7yrahsd5khyvshrh69swfv5s5anjk6n1vab26kmd1c2y"; + rev = "3644194d8b75c20e6c2c4139f2817f96cadcf791"; + sha256 = "0f0wn1xj55nzpcz51g0c716hhzknlmp2rw7ns6rnpi6cmh1gyv93"; }; }; @@ -1323,12 +1323,12 @@ let papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2019-02-27"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "c4a4dfdc21c14f58c12d077242ae33b729c894b2"; - sha256 = "01136926mr8z0b78srzvx6wkm8ipf3hv2vb8cj5sj8zgq6xs7kwg"; + rev = "6f34e06ac4b3e1ac7c5755a0216791066fbe74c8"; + sha256 = "13kdglkxdwxpmv0xwcwgzivb8x74bfypw2xn8w237niryvxg4y7z"; }; }; @@ -1719,12 +1719,12 @@ let targets-vim = buildVimPluginFrom2Nix { pname = "targets-vim"; - version = "2019-01-08"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "d6466f6f281f920e178637882a2e6e4f40c3acc2"; - sha256 = "04fzg94y37hm917klzz2k0j26wacnf0848nwa8br9b9vx5a6ixnv"; + rev = "5915a1a3cef7c60dbea2ff50153417e5f6371952"; + sha256 = "1013d1rkdg6ddnsf0j033q0a14aq65jbv2wrkj1d6i5jr4zjh3f0"; }; }; @@ -1851,23 +1851,23 @@ let verilog_systemverilog-vim = buildVimPluginFrom2Nix { pname = "verilog_systemverilog-vim"; - version = "2019-03-06"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "bbb0826fc2641f2b0fc3beb2ce5fc506515a4ffb"; - sha256 = "1ribz8g5jfvq160957p8b98ihb1sh42w1k670s65i6i45vgkws9r"; + rev = "f11dfab88b459087cd113cd9a0a0d77c06db565e"; + sha256 = "0wghhiwyc8rvzfdm3i5dq8s09sdmkr32kb3s8scvxvcc8b3h7wll"; }; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-03-16"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "f46e029b4a1cb16c014d8ddbf88e9d361fd2fcf0"; - sha256 = "1sh72zjjg12s6jx1vinj7j3mnx03mb4s44mpa4y62r78j48pfc0p"; + rev = "d8d75f8a12f6a6135c0069d37c4eb0fc35a1e360"; + sha256 = "0bg33h75fzp18w4y80mw12lgnhwqh3knmfsj1n81f1k2r080ndqd"; }; }; @@ -2093,23 +2093,23 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-03-16"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "b84e5485221096dc8c2bbc18f130e52265b367cc"; - sha256 = "0cflxpqiqs4dy0jplbciwy3v7ybxj1wmfijic0z6gvbcj6h0hxsv"; + rev = "45205aa4a393ab7eee2656e6e35eb61016ec81c2"; + sha256 = "1ln9di5dm8wj9v103jbj43az9whpax7zbvqwpad5v432rvnkqn2g"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2018-11-15"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9"; - sha256 = "1zwygmwa7gqppa49d2rsdwk5zv8rzj059bbclhs492bmbb5wyyz8"; + rev = "78cc30cb90b50fab024098bf2a55a4441665ff03"; + sha256 = "15mddh41vb44p1ppcsk3kb50fhqrlkdv4bmr2r7crny53cjfslh9"; }; }; @@ -2137,12 +2137,12 @@ let vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2019-02-26"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "d0ef603f037e8abf24ae1d959566722427a1bf92"; - sha256 = "12nqnvdhqv6wsksnd7hd3llw8vyxn0r8v98r0w1hsp7hw8mn1cgf"; + rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; + sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; }; }; @@ -2346,12 +2346,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2018-12-04"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "d33796c460229b2cf0dd09fedf1b272da9d13a42"; - sha256 = "0brhbkj34yxyq5gvjkqakq0m9zwa981rv6ksca07qhw3nzpxhlkd"; + rev = "a49d846ff641182e6cfb4bd675ddfc301e7fb378"; + sha256 = "0knjkjz0msz4b6j4ggwbjxj7mihqq1mdfw287zx5p5rjwpdfdfb0"; }; }; @@ -2434,12 +2434,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-03-13"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "d58efec5cef84c0a6eaeb0fea39e273ad438bd39"; - sha256 = "0djvnxirjjd9shyr76xy2saqbiw9albavddsc1vnsxw5hzlamfc9"; + rev = "d51d5f7eb5c46992ac718ac648e02e38322e073e"; + sha256 = "1n95zybvncfz5w4h77li22dcskb3xpf0jlfrw9g5ix80w1n41aar"; }; }; @@ -2588,12 +2588,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-03-17"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d769e0909d8a256f6e1031c98abaab71dc4eedce"; - sha256 = "0n6wl472rd2v6qiddpxs9bcg1fgpv1c5y3aax1njyvb1wic1yx35"; + rev = "cf0b9c919ef1e6e312bc471495d989abb42a5eea"; + sha256 = "09q7fvgvr0252hrn5amwls3bfzq0w6v5maf7jjnxi6g5gqmkh8m1"; }; }; @@ -2886,12 +2886,12 @@ let vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; - version = "2019-01-18"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "c05db65464e26aef281d4c1e0006d0504f2f76d7"; - sha256 = "0kq44q1ays0wwlfb3yqrfji3bfxpvbsrpzpp9dcf84836p0fpr1j"; + rev = "fbb88789b531e1fc1abe25b2f44f4f4c8a73f14d"; + sha256 = "0661dnm0idaqy28pw03fznq5hpl2pbb4r0c1gvdmf59ywhsa2dav"; }; }; @@ -2963,12 +2963,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-03-16"; + version = "2019-03-18"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "16f4f994a0414766ee1f1da069eed5230e409b53"; - sha256 = "1wkv09g5i4wgv01q9lvr5bnmpd5ai0xng0yah06faqn56cnhbawi"; + rev = "66ee01ef003efb5595b357b4b0a2414685ace85f"; + sha256 = "1cq19bs4gxga53v4ydvvnwgzp9s6c5csz7qwfhy6m9mmwgmmfddq"; }; }; @@ -3304,12 +3304,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2019-03-01"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "a2bb7be01815dab286735928001a009bcdb0d946"; - sha256 = "1yrg74h2lha4h1c1gxxj2sy462gn6h000bikhfbqk6lmqk2x9afv"; + rev = "ed236e0e3fa9d4c5c286581ee68b6fa7d976674b"; + sha256 = "13gq9qrqdwyiwk6whv4ji77xswbwphji1zgrgiid9l27a9ald43s"; }; }; @@ -3337,12 +3337,12 @@ let vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2018-11-16"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "e57ed3b6be2c4a49656f1a816919f0af22fae324"; - sha256 = "0g60prwfjc3mn1vq69ki8qcqcny952zpm3idq9x9l45iddfpihcr"; + rev = "57a350e6327af0074c4bc0d30b62662dfdb993af"; + sha256 = "1vgcy8xc8v0g5g4h1h6dcl0ggg2rxp2pisxj04w5d78qf8b48njc"; }; }; @@ -3425,12 +3425,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-03-15"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "c38d4002e025b568fcd7c26f3fe68cc78c5a8f31"; - sha256 = "1hxbzj7nmf29n4s5nxqm7y7srcxgdl60x5h6mxmvng5b0c9hlbb4"; + rev = "192d5734b18a3534e6db971036854ad0c4b2c586"; + sha256 = "1vk026gsjxr2954yn8zm179dvxrbmyc073mk78ghy473n9482np1"; }; }; @@ -3480,12 +3480,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-03-11"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "08f95628717ebca76e60643e76a84904a4520051"; - sha256 = "1bdmdi72zb87rjz6h03zkmvw2nvpqifsyx5imhz9lc7kjgw53k47"; + rev = "cbbf1559166f9c308ae0f4634c11bdf282ddafba"; + sha256 = "1hyn8fxaa7r55s51q9axm1awd10xmw29bmsfizy92vs3a8dxcqny"; }; }; @@ -3524,12 +3524,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-03-12"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "a56917282b58c047c64d560aada4029dafeb05ff"; - sha256 = "1g1imvyz34x75c6b9sr4r75ph0zbzy2gglq82mgld67vdpq14ww7"; + rev = "e4d35cc913336d4e17e147c88120e10f58562b4c"; + sha256 = "1kqx113dmsv8pm88g6lp8ahkyib78zln3iz4cls59r1803q1wf97"; }; }; @@ -3579,12 +3579,12 @@ let vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2019-02-20"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "fdfcb85fb3765f6aede3e909401c24a65e318740"; - sha256 = "136xqj246rckpc01h5y3ax6mnrhb0i22api8wd2dlqsh53glp9p6"; + rev = "a40ef26c5cc1806d3faae829fa149506715ce56f"; + sha256 = "0fis0w3xpsg4wfss61vydic6zisg5bdyvb0wcaf5z4fs5sk380x6"; }; }; @@ -3700,12 +3700,12 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-03-14"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "cb23e3f94abb9db01df5e57cc1ac23a4f42aa6a7"; - sha256 = "18jhlbs93qva5bdwl0j1p631r58j2ppaq9y9ka864m5hjbzvfnr6"; + rev = "e77923053fbce11323194ed04113b8d966be959c"; + sha256 = "1cka410c94wa6mz0pr4m8n9j7s9jhqnw513479pkmzx435ffb6ak"; }; }; @@ -3733,23 +3733,23 @@ let vim-vue = buildVimPluginFrom2Nix { pname = "vim-vue"; - version = "2018-11-11"; + version = "2019-03-22"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "e306929b27bea08ab505de7a4617e642b56b6dcd"; - sha256 = "1k48z8b6xmgqdcixx7yhbcf0jcyyfqv0zwijfq2j05559r9myx16"; + rev = "c7b133a66ec9dcf2200d1d2a4a7ad38909c5f539"; + sha256 = "1bmpwh0lhdbh6z39w2i27rirc6iy3jd89gp47xmfmgvw7fk1szn4"; }; }; vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2019-03-13"; + version = "2019-03-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "5ccfd1b31a290fdb5ee50a31f1629ed5df5cd8a4"; - sha256 = "0avldkcnl1nbz09lq58yrh9cw6gia5wyz3li1gck85j1cnhf1c8x"; + rev = "e287f95b596b832585439f77fad4b1e039d6d217"; + sha256 = "19all4i5f1kxf092qjnbxwcg18w1zllpnhf2ma9idj0ccbpl2ds5"; }; }; @@ -3865,12 +3865,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-03-09"; + version = "2019-03-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "3e23e22d1d15575c25e656503d3a650ad91d0ea4"; - sha256 = "15mwmfgl9w1j8bvida59k6hydgx2x7a78j611lhxrnm89fmkxfka"; + rev = "cc3b26ae923a0877b6c504a19f76bea4e3cb3e0c"; + sha256 = "1c4rkqlh7aknnmq12n889kwn7brkwa07bk4ydmhlagqvsjmwql5m"; }; }; @@ -3887,12 +3887,12 @@ let vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2019-03-09"; + version = "2019-03-20"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "5ab8f8672e6832da8f5a7eb371d2b24e8e0fff2c"; - sha256 = "0rcwng10l23gqbp3mc3i82vs56jzq5dikgcsj875bb9rhi23driy"; + rev = "a5ef4787505cb0c10544ef0a76fe9efbbc546972"; + sha256 = "0dh13ixkxp3fbbysxxd0rpmm5g7gaj0sa2d2bihlba8pf4dw3iv1"; }; }; @@ -4009,12 +4009,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-03-14"; + version = "2019-03-19"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "299f8e48e7d34e780d24b4956cd61e4d42a139eb"; - sha256 = "1ix7qv2ijs2i49p6c654wvsqcar25w4w71m0f8i4n0bh7wgc1g33"; + rev = "25ebc0b9abb1b135c809ee850085a0305cbc5533"; + sha256 = "0jv8h8wx8486n8add2ispcr7np278rvdndb2az4s72plh59xk05d"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index df69cb7065ba..746eeef83668 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -8,13 +8,13 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.7"; - sha256 = "1z1l9jbx7y7y643qxp76bxkpik4kbcqkw1492s11mrflqlfasyfn"; + version = "1.2.13"; + sha256 = "0zidlc1flgw8h9l5ph98xh6anxhggk4vpmq6k1k2sfzrrjypymgf"; }; postPatch = '' - mkdir -p dist/wakatime-master - cp -rt dist/wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime + mkdir -p wakatime-master + cp -rt wakatime-master --no-preserve=all ${wakatime}/lib/python*/site-packages/wakatime ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index bd85b6620ba6..a21a0bb58bd8 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -16,11 +16,36 @@ , protobufc , python , lxc +, writeText +, writeScript +, runtimeShell }: +let + + dbus-service = writeText "org.anbox.service" '' + [D-BUS Service] + Name=org.anbox + Exec=@out@/libexec/anbox-session-manager + ''; + + anbox-application-manager = writeScript "anbox-application-manager" '' + #!${runtimeShell} + + ${systemd}/bin/busctl --user call \ + org.freedesktop.DBus \ + /org/freedesktop/DBus \ + org.freedesktop.DBus \ + StartServiceByName "su" org.anbox 0 + + @out@/bin/anbox launch --package=org.anbox.appmgr --component=org.anbox.appmgr.AppViewActivity + ''; + +in + stdenv.mkDerivation rec { pname = "anbox"; - version = "2019-03-07"; + version = "unstable-2019-03-07"; src = fetchFromGitHub { owner = pname; @@ -29,10 +54,14 @@ stdenv.mkDerivation rec { sha256 = "1wfx4bsyxvrjl16dq5pqgial8rnnsnxzbak2ap0waddz847czxwz"; }; + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = [ cmake pkgconfig dbus boost libcap gtest systemd mesa glib SDL2 SDL2_image protobuf protobufc properties-cpp lxc python - makeWrapper libGL + libGL ]; patchPhase = '' @@ -68,60 +97,42 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \ --prefix PATH : ${git}/bin - mkdir -p $out/share/dbus-1/services/ - cat < $out/share/dbus-1/services/org.anbox.service - [D-BUS Service] - Name=org.anbox - Exec=$out/libexec/anbox-session-manager - END + mkdir -p $out/share/dbus-1/services + substitute ${dbus-service} $out/share/dbus-1/services/org.anbox.service \ + --subst-var out mkdir $out/libexec - cat > $out/libexec/anbox-session-manager < $out/bin/anbox-application-manager <ypad_pos < 1000) { +- if (tab_names[current_tab] == "Tunables" || "WakeUp") { ++ if (tab_names[current_tab] == "Tunables" || tab_names[current_tab] == "WakeUp") { + if ((w->cursor_pos + 7) >= LINES) { + prefresh(w->win, ++w->ypad_pos, w->xpad_pos, + 1, 0, LINES - 3, COLS - 1); diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 89375563ae67..039d875060a2 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -17,8 +17,8 @@ buildPythonApplication rec { sha256 = "0iyj35fff93cprjkzbkg9dn5xz8dg5h2kjx3476fl625nxxskndn"; }; - nativeBuildInputs = [ bison flex ]; - buildInputs = [ libsepol swig ]; + nativeBuildInputs = [ bison flex swig ]; + buildInputs = [ libsepol ]; propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2f873f34b885..d54972c055be 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -34,10 +34,12 @@ in stdenv.mkDerivation rec { # Upstream's maintenance branches are still too intrusive: # https://github.com/systemd/systemd-stable/tree/v239-stable patches-deb = fetchurl { - # When the URL disappears, it typically means that Debian has new patches - # (probably security) and updating to new tarball will apply them as well. + # This URL should point to a stable location that does not easily + # disappear. In the past we were using `mirror://debian` but that + # eventually causes the files to disappear. While that was a good sign + # for us to update our patch collection it does break reproducibility. name = "systemd-debian-patches.tar.xz"; - url = mirror://debian/pool/main/s/systemd/systemd_239-12~bpo9+1.debian.tar.xz; + url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz; sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg"; }; # Note that we skip debian-specific patches, i.e. ./debian/patches/debian/* diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 37f93c8e87e8..1b9f1e698d4d 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, fetchsvn, - jansson, libxml2, libxslt, ncurses, openssl, sqlite, + jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, newt, lua, speex, - srtp, wget, curl, iksemel + srtp, wget, curl, iksemel, pkgconfig }: let @@ -10,7 +10,11 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid newt lua speex srtp wget curl iksemel ]; + buildInputs = [ jansson libedit libxml2 libxslt ncurses openssl sqlite + dmidecode libuuid newt + lua speex + srtp wget curl iksemel ]; + nativeBuildInputs = [ utillinux pkgconfig ]; patches = [ # We want the Makefile to install the default /var skeleton @@ -39,8 +43,11 @@ let # you're likely missing an automatically downloaded dependency preConfigure = '' mkdir externals_cache - '' + lib.concatStringsSep "\n" - (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + '' + + ${lib.concatStringsSep "\n" + (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals)} + + ${lib.optionalString (externals ? "addons/mp3") "bash contrib/scripts/get_mp3_source.sh || true"} chmod -w externals_cache ''; @@ -53,7 +60,9 @@ let preBuild = '' make menuselect.makeopts - substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ${lib.optionalString (externals ? "addons/mp3") '' + substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ''} ''; postInstall = '' @@ -69,56 +78,78 @@ let }; }; - pjproject-27 = fetchurl { + pjproject_2_7_1 = fetchurl { url = http://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2; sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; + pjproject_2_8 = fetchurl { + url = http://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2; + sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; + }; + mp3-202 = fetchsvn { url = http://svn.digium.com/svn/thirdparty/mp3/trunk; rev = "202"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; -in -{ +in rec { + # Supported releases (as of 2018-11-20). + # + # Series Type Rel. Date Sec. Fixes EOL + # 13.x LTS 2014-10-24 2020-10-24 2021-10-24 + # 15.x Standard 2017-10-03 2018-10-03 2019-10-03 + asterisk-stable = asterisk_15; + # 16.x LTS 2018-10-09 2022-10-09 2023-10-09 + asterisk-lts = asterisk_16; + asterisk = asterisk_16; - asterisk-lts = common { - version = "13.20.0"; - sha256 = "a3d6d953f844867ea11e0be22ee6225049cd4f5870df6ab23454623bcfbc94d5"; + asterisk_13 = common { + version = "13.24.1"; + sha256 = "1mclpk7knqjl6jr6mpvhb17wsjah4bk2xqhb3shpx1j4z19xkmm3"; externals = { - "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; + "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject_2_7_1; "addons/mp3" = mp3-202; }; }; - asterisk-stable = common { - version = "15.3.0"; - sha256 = "f424f89f23b72f267ff9baab82d449bebbbf00c54e54fcd06b8fca13788b012c"; + asterisk_15 = common { + version = "15.7.0"; + sha256 = "1ngs73h4lz94b4f3shy1yb5laqy0z03zf451xa1nihrgp1h3ilyv"; externals = { - "externals_cache/pjproject-2.7.1.tar.bz2" = pjproject-27; + "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8; "addons/mp3" = mp3-202; }; }; - # asterisk-git = common { - # version = "15-pre"; - # sha256 = "..."; - # externals = { + asterisk_16 = common { + version = "16.1.1"; + sha256 = "19bfvqmxphk2608jx7jghfy7rdbj1qj5vw2fyb0fq4xjvx919wmv"; + externals = { + "externals_cache/pjproject-2.8.tar.bz2" = pjproject_2_8; + "addons/mp3" = mp3-202; + }; + }; + + #asterisk-git = common { + # version = "15-pre"; + # sha256 = "..."; + # externals = { # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; - # Note that these sounds are included with the release tarball. They are - # provided here verbatim for the convenience of anyone wanting to build - # Asterisk from other sources. Include in externals. - # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; - # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; - # }; - # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; - # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; - # }; - # TODO: Sounds for other languages could be added here - # } - # }.overrideDerivation (_: {src = fetchgit {...}}) + # # Note that these sounds are included with the release tarball. They are + # # provided here verbatim for the convenience of anyone wanting to build + # # Asterisk from other sources. Include in externals. + # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; + # }; + # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; + # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; + # }; + # # TODO: Sounds for other languages could be added here + # } + #}.overrideDerivation (_: {src = fetchgit {...}}) } diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index fff678395319..722ae26b166a 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.6"; + version = "4.1.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - sha256 = "0ggpcvzj90a31qf71m8788ql0hbxnkb9y6c3wgqr9l0qwv8dsgpm"; + sha256 = "11c4r0mbq6ybbihm0jbl9hspb01pj1gi6x3m374liw9jij7dw8b4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 046aa1bb4251..9a41fdb880a9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.89.2"; + version = "0.90.1"; components = { "abode" = ps: with ps; [ ]; "abode.alarm_control_panel" = ps: with ps; [ ]; @@ -60,6 +60,8 @@ "android_ip_webcam.binary_sensor" = ps: with ps; [ ]; "android_ip_webcam.sensor" = ps: with ps; [ ]; "android_ip_webcam.switch" = ps: with ps; [ ]; + "androidtv" = ps: with ps; [ ]; + "androidtv.media_player" = ps: with ps; [ ]; "apcupsd" = ps: with ps; [ ]; "apcupsd.binary_sensor" = ps: with ps; [ ]; "apcupsd.sensor" = ps: with ps; [ ]; @@ -180,6 +182,8 @@ "canary" = ps: with ps; [ ]; "cast" = ps: with ps; [ PyChromecast ]; "cast.media_player" = ps: with ps; [ PyChromecast ]; + "cisco_mobility_express" = ps: with ps; [ ]; + "cisco_mobility_express.device_tracker" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; "climate.const" = ps: with ps; [ ]; "climate.coolmaster" = ps: with ps; [ ]; @@ -202,13 +206,10 @@ "climate.touchline" = ps: with ps; [ ]; "climate.venstar" = ps: with ps; [ ]; "climate.zhong_hong" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors warrant ]; - "cloud.auth_api" = ps: with ps; [ ]; - "cloud.cloud_api" = ps: with ps; [ ]; - "cloud.cloudhooks" = ps: with ps; [ ]; + "cloud" = ps: with ps; [ aiohttp-cors ]; + "cloud.binary_sensor" = ps: with ps; [ aiohttp-cors ]; "cloud.const" = ps: with ps; [ ]; "cloud.http_api" = ps: with ps; [ ]; - "cloud.iot" = ps: with ps; [ ]; "cloud.prefs" = ps: with ps; [ ]; "cloud.utils" = ps: with ps; [ ]; "cloudflare" = ps: with ps; [ ]; @@ -217,16 +218,15 @@ "comfoconnect.fan" = ps: with ps; [ ]; "comfoconnect.sensor" = ps: with ps; [ ]; "config" = ps: with ps; [ aiohttp-cors ]; - "config.area_registry" = ps: with ps; [ aiohttp-cors ]; + "config.area_registry" = ps: with ps; [ ]; "config.auth" = ps: with ps; [ ]; "config.automation" = ps: with ps; [ ]; "config.config_entries" = ps: with ps; [ ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; - "config.device_registry" = ps: with ps; [ aiohttp-cors ]; - "config.entity_registry" = ps: with ps; [ aiohttp-cors ]; + "config.device_registry" = ps: with ps; [ ]; + "config.entity_registry" = ps: with ps; [ ]; "config.group" = ps: with ps; [ ]; - "config.hassbian" = ps: with ps; [ ]; "config.script" = ps: with ps; [ ]; "config.zwave" = ps: with ps; [ ]; "configurator" = ps: with ps; [ ]; @@ -245,6 +245,8 @@ "cover.opengarage" = ps: with ps; [ ]; "cover.rflink" = ps: with ps; [ ]; "cover.template" = ps: with ps; [ ]; + "cppm_tracker" = ps: with ps; [ ]; + "cppm_tracker.device_tracker" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; "daikin.climate" = ps: with ps; [ ]; "daikin.config_flow" = ps: with ps; [ ]; @@ -267,7 +269,7 @@ "deconz.scene" = ps: with ps; [ ]; "deconz.sensor" = ps: with ps; [ ]; "deconz.switch" = ps: with ps; [ ]; - "default_config" = ps: with ps; [ pynacl aiohttp-cors distro netdisco sqlalchemy warrant ]; + "default_config" = ps: with ps; [ pynacl aiohttp-cors distro sqlalchemy zeroconf ]; "demo" = ps: with ps; [ aiohttp-cors ]; "demo.remote" = ps: with ps; [ ]; "device_sun_light_trigger" = ps: with ps; [ ]; @@ -317,6 +319,7 @@ "device_tracker.unifi" = ps: with ps; [ pyunifi ]; "device_tracker.unifi_direct" = ps: with ps; [ pexpect ]; "device_tracker.upc_connect" = ps: with ps; [ defusedxml ]; + "device_tracker.xfinity" = ps: with ps; [ ]; "device_tracker.xiaomi" = ps: with ps; [ ]; "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -373,6 +376,8 @@ "emulated_roku.binding" = ps: with ps; [ ]; "emulated_roku.config_flow" = ps: with ps; [ ]; "emulated_roku.const" = ps: with ps; [ ]; + "enigma2" = ps: with ps; [ ]; + "enigma2.media_player" = ps: with ps; [ ]; "enocean" = ps: with ps; [ ]; "enocean.binary_sensor" = ps: with ps; [ ]; "enocean.light" = ps: with ps; [ ]; @@ -490,9 +495,13 @@ "homekit_controller.alarm_control_panel" = ps: with ps; [ ]; "homekit_controller.binary_sensor" = ps: with ps; [ ]; "homekit_controller.climate" = ps: with ps; [ ]; + "homekit_controller.config_flow" = ps: with ps; [ ]; + "homekit_controller.connection" = ps: with ps; [ ]; + "homekit_controller.const" = ps: with ps; [ ]; "homekit_controller.cover" = ps: with ps; [ ]; "homekit_controller.light" = ps: with ps; [ ]; "homekit_controller.lock" = ps: with ps; [ ]; + "homekit_controller.sensor" = ps: with ps; [ ]; "homekit_controller.switch" = ps: with ps; [ ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematic.binary_sensor" = ps: with ps; [ pyhomematic ]; @@ -516,6 +525,7 @@ "homematicip_cloud.light" = ps: with ps; [ ]; "homematicip_cloud.sensor" = ps: with ps; [ ]; "homematicip_cloud.switch" = ps: with ps; [ ]; + "homematicip_cloud.weather" = ps: with ps; [ ]; "homeworks" = ps: with ps; [ ]; "homeworks.light" = ps: with ps; [ ]; "http" = ps: with ps; [ aiohttp-cors ]; @@ -551,6 +561,7 @@ "ihc.light" = ps: with ps; [ defusedxml ]; "ihc.sensor" = ps: with ps; [ defusedxml ]; "ihc.switch" = ps: with ps; [ defusedxml ]; + "ihc.util" = ps: with ps; [ ]; "image_processing" = ps: with ps; [ aiohttp-cors ]; "image_processing.demo" = ps: with ps; [ ]; "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; @@ -622,6 +633,9 @@ "knx.switch" = ps: with ps; [ ]; "konnected" = ps: with ps; [ aiohttp-cors ]; "konnected.binary_sensor" = ps: with ps; [ aiohttp-cors ]; + "konnected.const" = ps: with ps; [ ]; + "konnected.handlers" = ps: with ps; [ ]; + "konnected.sensor" = ps: with ps; [ aiohttp-cors ]; "konnected.switch" = ps: with ps; [ aiohttp-cors ]; "lametric" = ps: with ps; [ ]; "lametric.notify" = ps: with ps; [ ]; @@ -651,7 +665,7 @@ "light.litejet" = ps: with ps; [ ]; "light.lw12wifi" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; - "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ]; + "light.nanoleaf" = ps: with ps; [ ]; "light.niko_home_control" = ps: with ps; [ ]; "light.opple" = ps: with ps; [ ]; "light.osramlightify" = ps: with ps; [ ]; @@ -739,7 +753,6 @@ "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; "media_player.epson" = ps: with ps; [ ]; - "media_player.firetv" = ps: with ps; [ firetv ]; "media_player.frontier_silicon" = ps: with ps; [ ]; "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; @@ -788,6 +801,14 @@ "meteo_france.weather" = ps: with ps; [ ]; "microsoft_face" = ps: with ps; [ aiohttp-cors ]; "mobile_app" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.binary_sensor" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.const" = ps: with ps; [ ]; + "mobile_app.entity" = ps: with ps; [ ]; + "mobile_app.helpers" = ps: with ps; [ ]; + "mobile_app.http_api" = ps: with ps; [ ]; + "mobile_app.sensor" = ps: with ps; [ pynacl aiohttp-cors ]; + "mobile_app.webhook" = ps: with ps; [ ]; + "mobile_app.websocket_api" = ps: with ps; [ ]; "mochad" = ps: with ps; [ ]; "mochad.light" = ps: with ps; [ ]; "mochad.switch" = ps: with ps; [ ]; @@ -1305,6 +1326,11 @@ "spider.switch" = ps: with ps; [ ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; + "stream" = ps: with ps; [ aiohttp-cors av ]; + "stream.const" = ps: with ps; [ ]; + "stream.core" = ps: with ps; [ ]; + "stream.hls" = ps: with ps; [ ]; + "stream.worker" = ps: with ps; [ ]; "sun" = ps: with ps; [ ]; "switch" = ps: with ps; [ ]; "switch.acer_projector" = ps: with ps; [ pyserial ]; @@ -1391,6 +1417,8 @@ "tibber.notify" = ps: with ps; [ ]; "tibber.sensor" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; + "tof" = ps: with ps; [ ]; + "tof.sensor" = ps: with ps; [ ]; "toon" = ps: with ps; [ ]; "toon.binary_sensor" = ps: with ps; [ ]; "toon.climate" = ps: with ps; [ ]; @@ -1516,6 +1544,7 @@ "websocket_api.error" = ps: with ps; [ ]; "websocket_api.http" = ps: with ps; [ ]; "websocket_api.messages" = ps: with ps; [ ]; + "websocket_api.permissions" = ps: with ps; [ ]; "wemo" = ps: with ps; [ ]; "wemo.binary_sensor" = ps: with ps; [ ]; "wemo.fan" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6b146459e8f1..1de084c84ea5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -44,6 +44,8 @@ let "15qfl3pnw2f11r0z0zhwl56f6pb60ysav8fxmpnz5p80cfwljdik") (mkOverride "python-slugify" "1.2.6" "7723daf30996db26573176bddcdf5fcb98f66dc70df05c9cb29f2c79b8193245") + (mkOverride "pyyaml" "3.13" + "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf") (mkOverride "requests" "2.21.0" "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e") (mkOverride "ruamel_yaml" "0.15.88" @@ -95,7 +97,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.89.2"; + hassVersion = "0.90.1"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -110,7 +112,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1k91mq45nq80dwkzqrlax7bvmv556ipr3pqh7i3k1lcaryn5p0l7"; + sha256 = "1w8mbrzr760867a342jyihxbkx3i9pdsdxdv2ck15fy4axd3wbsh"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index cb5ddbc9c50e..a011e35ae64e 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,15 +2,18 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20190305.1"; + version = "20190321.0"; src = fetchPypi { inherit pname version; - sha256 = "1b07b7efb3e0004df752f9aa40c42e80d5da13371f48df8e21c7579093849aae"; + sha256 = "0sk96mnmvsbcqjjcrlgfsxkywms0zmajjgn3ibvk4sfn5wn53bg7"; }; propagatedBuildInputs = [ user-agents ]; + # no Python tests implemented + doCheck = false; + meta = with lib; { description = "Polymer frontend for Home Assistant"; homepage = https://github.com/home-assistant/home-assistant-polymer; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index db459dc81c8e..2993809c5563 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.52"; + name = "lighttpd-1.4.53"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0r57zp7050qxlwg41xqnqnhw3lrl34cg5zvfbqrwddrhqn8hkg17"; + sha256 = "0y6b3lvv0cmn7mlm832k7z31fmrc6hazn9lcd9ahlrg9ycfcxprv"; }; postPatch = '' diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index c96eed7a57b3..912e520180e6 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "hydron-unstable-${version}"; - version = "2018-10-08"; + version = "2019-02-17"; goPackagePath = "github.com/bakape/hydron"; goDeps = ./deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "hydron"; - rev = "0a834bcaf9af3a6bac8873fad981aa3736115258"; - sha256 = "154s1jjcdcwaxial2gsxaqb8bc1hwagz844ld2jr928jxj7ffqww"; + rev = "824789fb108966432e507143db39b358dd7ff233"; + sha256 = "1xxykjf5iyavm12gd6nx4j8x2mlzzn7x8vm0j5009lsir98qr5zn"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix index 92ac9a8325d9..08f165af76b2 100644 --- a/pkgs/servers/hydron/deps.nix +++ b/pkgs/servers/hydron/deps.nix @@ -5,8 +5,17 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47"; - sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q"; + rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; + sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; + }; + } + { + goPackagePath = "github.com/bakape/boorufetch"; + fetch = { + type = "git"; + url = "https://github.com/bakape/boorufetch"; + rev = "90aee10269a138a08ce49cd91635500336657a82"; + sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; }; } { @@ -14,8 +23,17 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d"; - sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x"; + rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; + sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; + }; + } + { + goPackagePath = "github.com/chai2010/webp"; + fetch = { + type = "git"; + url = "https://github.com/chai2010/webp"; + rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; + sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d"; - sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj"; + rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; + sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; }; } { @@ -32,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "350d97a79266938cd77a9192b7d995132d4e2b5b"; - sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b"; + rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; + sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; }; } { @@ -63,13 +81,31 @@ sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; }; } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "1de009706dbeb9d05f18586f0735fcdb7c524481"; + sha256 = "0y4wq6wwj9ivqr397wcr6n0bd9m85qpk367bp65hkfi9x3mnlcb4"; + }; + } { goPackagePath = "github.com/mattn/go-sqlite3"; fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "6a9185d7b1f12363e2c904449d374b63b6093b16"; - sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki"; + rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; + sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; + }; + } + { + goPackagePath = "github.com/nwaples/rardecode"; + fetch = { + type = "git"; + url = "https://github.com/nwaples/rardecode"; + rev = "197ef08ef68c4454ae5970a9c2692d6056ceb8d7"; + sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; }; } { @@ -86,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; - sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; + rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; + sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; }; } { @@ -95,8 +131,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + rev = "d8887717615a059821345a5c23649351b52a1c0b"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; }; } ] diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 2d9d2fe0f154..7528c4c8c035 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.4.1"; + name = "dovecot-2.3.5"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "01xa8d08c0j51w5kmqb3vnzrvh17hkzx5a5p7fb5hgn3wln3x1xq"; + sha256 = "1zxa9banams9nmk99sf1rqahr11cdqxhwi7hyz3ddxqidpn15qdz"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 504df8bae0cb..d983c0677191 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -1,34 +1,35 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full, ghostscript -, graphicsmagick, quicktemplate, go-bindata, easyjson, nodePackages, emscripten, opencv }: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, cmake, ffmpeg-full +, ghostscript, graphicsmagick, quicktemplate, go-bindata, easyjson +, nodePackages, emscripten, opencv, statik }: buildGoPackage rec { name = "meguca-unstable-${version}"; - version = "2018-12-06"; + version = "2019-03-12"; goPackagePath = "github.com/bakape/meguca"; goDeps = ./server_deps.nix; src = fetchFromGitHub { owner = "bakape"; repo = "meguca"; - rev = "300b007cab238838f813faa9aad6abb3f22ad4d2"; - sha256 = "1rvnvhkm8l7h9rvw9vr8pm1qrr3zz5x7vayaw0caqx99xlyp93r9"; + rev = "21b08de09b38918061c5cd0bbd0dc9bcc1280525"; + sha256 = "1nb3bf1bscbdma83sp9fbgvmxxlxh21j9h80wakfn85sndcrws5i"; fetchSubmodules = true; }; enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten opencv ]; + + buildInputs = [ + ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata + easyjson emscripten opencv statik + ]; buildPhase = '' export HOME=`pwd` - export GOPATH=$GOPATH:$HOME/go/src/github.com/bakape/meguca/server - cd $HOME/go/src/github.com/bakape/meguca + cd go/src/github.com/bakape/meguca ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules sed -i "/npm install --progress false --depth 0/d" Makefile - make generate_clean - go generate meguca/... - go build -v -p $NIX_BUILD_CORES meguca - make -j $NIX_BUILD_CORES client + make -j $NIX_BUILD_CORES generate all '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' make -j $NIX_BUILD_CORES wasm ''; diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix index 5dc53820a9d2..bff9d5624e83 100644 --- a/pkgs/servers/meguca/server_deps.nix +++ b/pkgs/servers/meguca/server_deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/ErikDubbelboer/gspt"; - rev = "e39e726e09cc23d1ccf13b36ce10dbdb4a4510e0"; - sha256 = "1l0s9srl7kbi7rs9ki989rgvx1kx6an7d6pwfqyy42x48f7a5g81"; + rev = "e68493906b8382891943ddc9960cb9c6ecd1a1f0"; + sha256 = "17xjyg6zw02yzly30hs92pwgn0w85naixr4kb2c0mgp5zavl1ffz"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/squirrel"; - rev = "e5bf00f96d4a5779be0d78f7565598856cae9b47"; - sha256 = "13fkdc4kbdmbl42i80lm5x9aqnwlhj2c6s6y5vsblmw042p7012q"; + rev = "d67d6a236213ef67cff454e09ea1bf742d943f6c"; + sha256 = "0gzvnws0a29c663hjk379bybvxfmkiic3spkc985hdvn5gkbrwkq"; }; } { @@ -23,17 +23,8 @@ fetch = { type = "git"; url = "https://github.com/PuerkitoBio/goquery"; - rev = "2d2796f41742ece03e8086188fa4db16a3a0b458"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; - }; - } - { - goPackagePath = "github.com/Soreil/apngdetector"; - fetch = { - type = "git"; - url = "https://github.com/Soreil/apngdetector"; - rev = "e412c29dbc998dfcffe266b12587b29096ac4d46"; - sha256 = "0ci71nk6jijspzbgcfrgi4in9lmd2c39f6xzcf9k3z9ixwv8c79j"; + rev = "3dcf72e6c17f694381a21592651ca1464ded0e10"; + sha256 = "0fpsf6b54z33a7zl28x860jbaj3g5722g8kpqs6rdpaqv99yyvnn"; }; } { @@ -50,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/aquilax/tripcode"; - rev = "db58da84bb12e26032493b73eb3b58ba884590ef"; - sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3"; + rev = "1a14b0a5e89f7fdb8a821562569338ad59ab2da5"; + sha256 = "1ishrg37gkkx04gbchhsk7jp01mmfvln2i2zrncbj4qxs2amnn2l"; }; } { @@ -59,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/badoux/goscraper"; - rev = "363803726ad4e2ab262b4e01362e98458df0b231"; - sha256 = "1p388s7jmyrr6p4ralhcg36jz1cw2mgra9brcp6m32lrc3mpws48"; + rev = "9b4686c4b62c22b0489d53dddf5421605caba33e"; + sha256 = "1f1wc4s2b6g1ndpihb0gn7cxmwyi4wfqi5slvsk6i6p9q4kxrkvx"; }; } { @@ -68,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/boorufetch"; - rev = "4e9f999d98ed9a4e8374a516265dd4c7b4f4cca0"; - sha256 = "0jpf71nxm8msx3imgyl3jdpi8fsai3yp7ajapivghrwj7y0nr1d0"; + rev = "90aee10269a138a08ce49cd91635500336657a82"; + sha256 = "0zaa2b3bl2hnl4lipghl6mbvpv9sq9r7skykp26c29qy77xy99nk"; }; } { @@ -77,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/captchouli"; - rev = "6434ea655cf8f1fed6791877c74e5e2f2c396680"; - sha256 = "1n96g3c7i3gbk8blm6qgw9lcpmwq3s8yjp6l1krdladb0xpanwjm"; + rev = "b57177c8d2f239547e9545354e2f55fbc851ab47"; + sha256 = "1fi24322bbicc2bpfla37nhy2w89cf67345dbybcavgcny5rs65a"; }; } { @@ -95,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/bakape/thumbnailer"; - rev = "f191a43e9c3c7c9522a67dd81ed1aec9cea0280d"; - sha256 = "065qxhc83ncfxl813gm2f80pydkilnyim0q4wv08xm4gz3010s1x"; + rev = "3d9565548e572a385b5a1ecf3bb9840c9ccd9949"; + sha256 = "0zriks4j694y65ryf9xkiz0sc932hskjigmk83bj1069hkgzx9dk"; }; } { @@ -108,13 +99,22 @@ sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2"; }; } + { + goPackagePath = "github.com/chai2010/webp"; + fetch = { + type = "git"; + url = "https://github.com/chai2010/webp"; + rev = "76ae9d0b5d6d590fcc9772bf9cf0526128ee6fab"; + sha256 = "0sanh0c2bvignxnrj9vlzr2sw1bd3cgw2lg0vkn63xxjj3bqmsbh"; + }; + } { goPackagePath = "github.com/dimfeld/httptreemux"; fetch = { type = "git"; url = "https://github.com/dimfeld/httptreemux"; - rev = "0ffa82afd135e2aafd48602dc46843cb86304f7d"; - sha256 = "0akariyk9igr25rbjkvq7v1hwx8llld6d2dalkdla9jsh7iw6ddj"; + rev = "a454a10de4a11f751681a0914461ab9e98c2a3ff"; + sha256 = "0qx94lij9ldzd1xl36rl8blbgzjz9b4rkpydi44d9lik7qkdi5gp"; }; } { @@ -122,8 +122,17 @@ fetch = { type = "git"; url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; - sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; + rev = "da652975a8eea9fa0735aba8056747a751db0bd3"; + sha256 = "1wwjaymzb1xxq3ybch3nwn72xhi2s40cvz0cl986yad3w1xwzj91"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "11844c0959f6fff69ba325d097fce35bd85a8e93"; + sha256 = "0driasljawka9r914530mr9df2i5cwldcgj2v94qkhzlkb48ljwc"; }; } { @@ -140,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/errors"; - rev = "9aa88f624b398d37201c30583065aee54071bc0c"; - sha256 = "0d4b73m564gc12ddbss78929kcya81ifqxv28f05zqhrywkih4mh"; + rev = "4050dd2e2e3b2052ef736048661d1d23a4a4e55d"; + sha256 = "0b3bhf2c9fpv095db3ajyb1fz7nxjn7rfg9rjb83hqfm492wjy86"; }; } { @@ -149,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/go-playground/log"; - rev = "736ecb55f80c7121af3754a7ea62e96733451fe1"; - sha256 = "1gr2658m8nwswiybnz5i54d4gzwx4nk79gnh7j5fj1rcmbxdkkjh"; + rev = "fdcdf507e3bf20900bc1a44b0cbd73fee5bcbe19"; + sha256 = "0mbzawm09n2kggrkmj0khrhipmdi191z01mw120ahbmmjdjls749"; }; } { @@ -158,8 +167,8 @@ fetch = { type = "git"; url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; + rev = "2a8bb927dd31d8daada140a5d09578521ce5c36a"; + sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; }; } { @@ -167,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/handlers"; - rev = "350d97a79266938cd77a9192b7d995132d4e2b5b"; - sha256 = "1rk69bnhcp4s4cv7hwsafag8d3fj1mgxli0bkazc69ig90a71h1b"; + rev = "ac6d24f88de4584385a0cb3a88f953d08a2f7a05"; + sha256 = "166p7yw2sy6lbxgyk722phkskmxzv3v21vf0l145zicrn30m9zli"; }; } { @@ -176,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b"; - sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48"; + rev = "0ec3d1bd7fe50c503d6df98ee649d81f4857c564"; + sha256 = "0mdq489izwy20bpjg31k8qnfgvh5r7mm5yq709q6xyzmzdd5nasx"; }; } { @@ -221,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-sqlite3"; - rev = "6a9185d7b1f12363e2c904449d374b63b6093b16"; - sha256 = "1yb04vhzkaxnm11i34lpcdgzmcydfnlky3xxj9q2hm1wd7hn3hki"; + rev = "ad30583d8387ce8118f8605eaeb3b4f7b4ae0ee1"; + sha256 = "024h09n4g41x4awzim5l0vxpj1nfwc9isf8bryrdnichpqpa6siz"; }; } { @@ -234,22 +243,13 @@ sha256 = "0vvijw7va283dbdvnf4bgkn7bjngxqzk1rzdpy8sl343r62bmh4g"; }; } - { - goPackagePath = "github.com/nyarlabo/go-crypt"; - fetch = { - type = "git"; - url = "https://github.com/nyarlabo/go-crypt"; - rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1"; - sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1"; - }; - } { goPackagePath = "github.com/oschwald/maxminddb-golang"; fetch = { type = "git"; url = "https://github.com/oschwald/maxminddb-golang"; - rev = "ed835b22606182ff576f244643e52b25b7d6c4e7"; - sha256 = "0zm4nyxz89s05fkz0fcaab3dmm24cb24iwjbzh06a49dwvcxxrgw"; + rev = "fc04c43d3c694a35570a7e4358b0f4d4ac3fea32"; + sha256 = "16bz3g8mkg2xhb4pxcpk6scxrmn48485jgky7wvi4gzpizlhsxxq"; }; } { @@ -257,8 +257,8 @@ fetch = { type = "git"; url = "https://github.com/otium/ytdl"; - rev = "0227c2bacb82a434f2332d7d8c64093615c08a40"; - sha256 = "1g5h6s5c860yamgr606l6ibpqx39676vas75c9426556hwgp3pqs"; + rev = "5c8ee71b4175be285baaff66147458254884f748"; + sha256 = "1w22cfc6nr7z5fc3hmcymmx2xfcb66ylhfs89vn4i19ksxbkkcjk"; }; } { @@ -266,8 +266,17 @@ fetch = { type = "git"; url = "https://github.com/pierrec/lz4"; - rev = "623b5a2f4d2a41e411730dcdfbfdaeb5c0c4564e"; - sha256 = "1hhf7vyz5irrqs7ixdmvsvzmy9izv3ha8jbyy0cs486h61nzqkki"; + rev = "062282ea0dcff40c9fb8525789eef9644b1fbd6e"; + sha256 = "04lzigxv2f4yv9gr1dybsjkcnmv1lj0mx9ls2ry1pzy2l9z6i6cp"; + }; + } + { + goPackagePath = "github.com/rakyll/statik"; + fetch = { + type = "git"; + url = "https://github.com/rakyll/statik"; + rev = "79258177a57a85a8ab2eca7ce0936aad80307f4e"; + sha256 = "14wqh38a7dhm2jgr1lsl2wdvjmkgdapzl2z4a1vl7ncv3x43gkg5"; }; } { @@ -275,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/sevlyar/go-daemon"; - rev = "12616e426b1522ef2099701fafdd6ad9f476e8c1"; - sha256 = "1hakfpdxlqvdbp4c597ldf33s5yalsh5db6ym1xh5y7h27v8bk01"; + rev = "fedf95d0cd0be92511436dbc84c290ff1c104f61"; + sha256 = "1ffjgx75wvpharzq60aqbpl78z1jwx13b21ifcadm1f976vdjq1q"; }; } { @@ -284,8 +293,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "29d7eb25e8ffa54207ff5a9a5c3d63e95be2cc39"; - sha256 = "1barxwfwnmsa45iqqrppzj830ypm500aq9w234gyyh1gdknijck4"; + rev = "dae0fa8d5b0c810a8ab733fbd5510c7cae84eca4"; + sha256 = "1y1qjcg19z7q9sy32rhc148kdql2aw7xkcm9d6r1blrl0mdgpx0w"; }; } { @@ -293,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/ulikunitz/xz"; - rev = "590df8077fbcb06ad62d7714da06c00e5dd2316d"; - sha256 = "07mivr4aiw3b8qzwajsxyjlpbkf3my4xx23lv0yryc4pciam5lhy"; + rev = "6f934d456d51e742b4eeab20d925a827ef22320a"; + sha256 = "1qpk02c0nfgfyg110nmbaiy5x12fpn0pm8gy7h1s8pwns133n831"; }; } { @@ -311,8 +320,17 @@ fetch = { type = "git"; url = "https://github.com/valyala/quicktemplate"; - rev = "4c04039b1358b0f49af22a699f9193f05d80be40"; - sha256 = "1qf7wpalk3n2jmcc2sw05cnwysl4rx986avykbfic5wq4fgxh9a5"; + rev = "d08324ac14fa81325830fae7eb30188ec68427f8"; + sha256 = "0gpc1kcqvcn1f9mz2dww8bhrspnsk2fgxzvx398vy7a0xhxq8vhx"; + }; + } + { + goPackagePath = "gitlab.com/nyarla/go-crypt"; + fetch = { + type = "git"; + url = "https://gitlab.com/nyarla/go-crypt.git"; + rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1"; + sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1"; }; } { @@ -320,8 +338,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "c2843e01d9a2bc60bb26ad24e09734fdc2d9ec58"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; }; } { @@ -329,8 +347,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "351d144fa1fc0bd934e2408202be0c29f25e35a0"; - sha256 = "1c5x25qjyz83y92bq0lll5kmznyi3m02wd4c54scgf0866gy938k"; + rev = "d8887717615a059821345a5c23649351b52a1c0b"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; }; } { @@ -338,8 +356,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "70b957f3b65e069b4930ea94e2721eefa0f8f695"; - sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw"; + rev = "fead79001313d15903fb4605b4a1b781532cd93e"; + sha256 = "12vwl6sv6w7q0dyvynjhbp67242rhh77d6nlsb22ajr8rf17c63i"; }; } { @@ -347,8 +365,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2"; - sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj"; + rev = "5d731a35f4867878fc89f7744f7b6debb3beded6"; + sha256 = "1ipmjki0i0dvpal1g0vgr8qc77kkvw3ka6yxlm0qzjk9j3579bsq"; }; } { diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index f94d185910f9..9a4f96c46ba8 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.14.1.5488"; - vsnHash = "cc260c476"; - sha256 = "8ee806f35ccedcecd0cab028bbe1f7e2ac7de24292b715978d3165c4712f5c40"; + version = "1.15.2.793"; + vsnHash = "782228f99"; + sha256 = "0yxxyczcgbk79bhnbbqpsj6vg1hi2pbf88r29dmskr664a5s0sk7"; }; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = plexpkg.sha256; src = fetchurl { - url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; + url = "https://downloads.plex.tv/plex-media-server-new/${version}-${vsnHash}/redhat/plexmediaserver-${version}-${vsnHash}.x86_64.rpm"; inherit sha256; }; @@ -45,15 +45,12 @@ in stdenv.mkDerivation rec { "Plex Transcoder" \ "Plex Tuner Service" ; do patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" - patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" + patchelf --set-rpath "$out/usr/lib/plexmediaserver/lib" "$out/usr/lib/plexmediaserver/$bin" done find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \; - # executables need libstdc++.so.6 - ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6" - # Our next problem is the "Resources" directory in /usr/lib/plexmediaserver. # This is ostensibly a skeleton directory, which contains files that Plex # copies into its folder in /var. Unfortunately, there are some SQLite diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 955b60678847..6e62aee13752 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -60,7 +60,7 @@ let (if atLeast "9.6" then ./patches/less-is-more-96.patch else ./patches/less-is-more.patch) (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch - ]; + ] ++ lib.optional stdenv.isLinux ./patches/socketdir-in-run.patch; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch b/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch new file mode 100644 index 000000000000..969f80ff8fc7 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/socketdir-in-run.patch @@ -0,0 +1,13 @@ +diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h +index 743401cb96..be5c5f61d2 100644 +--- a/src/include/pg_config_manual.h ++++ b/src/include/pg_config_manual.h +@@ -179,7 +179,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + + /* + * This is the default event source for Windows event log. diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index 668dcabc0499..1df05099fbf5 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -95,13 +95,25 @@ stageFuns: let __hatPackages = nextStage; }; }; - in - if args.__raw or false - then args' - else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { - buildPackages = if args.selfBuild or true then null else prevStage; - targetPackages = if args.selfBuild or true then null else nextStage; - }); + thisStage = + if args.__raw or false + then args' + else allPackages ((builtins.removeAttrs args' ["selfBuild"]) // { + adjacentPackages = if args.selfBuild or true then null else rec { + pkgsBuildBuild = prevStage.buildPackages; + pkgsBuildHost = prevStage; + pkgsBuildTarget = + if args.stdenv.targetPlatform == args.stdenv.hostPlatform + then pkgsBuildHost + else assert args.stdenv.hostPlatform == args.stdenv.buildPlatform; thisStage; + pkgsHostHost = + if args.stdenv.hostPlatform == args.stdenv.targetPlatform + then thisStage + else assert args.stdenv.buildPlatform == args.stdenv.hostPlatform; pkgsBuildHost; + pkgsTargetTarget = nextStage; + }; + }); + in thisStage; # This is a hack for resolving cross-compiled compilers' run-time # deps. (That is, compilers that are themselves cross-compiled, as diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 41f21abd44d6..46f2cb33bb06 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.190"; + version = "1.191"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0qklm9ww1wap2bs7hp31xkfjyhdrirg2mk4hiv7h6fiqckzmdwvd"; + sha256 = "0wplhjadk530fqxhfnizil32rcvkcl5m2r18yskspcib53r4pmim"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index 59b0b4104cc0..897067774a9f 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "wpgtk"; - version = "5.8.7"; + version = "6.0.3"; src = fetchFromGitHub { owner = "deviantfero"; repo = "wpgtk"; - rev = "${version}"; - sha256 = "1pwchmipswk5sld1l5p8mdiicb848glnh7r3s5x9qvijp5s57c5i"; + rev = version; + sha256 = "1ma1d4h751qnxadfn42h29knq0rl1lgzraifx6ypidjph5i5a10l"; }; buildInputs = [ diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix new file mode 100644 index 000000000000..043514ebb436 --- /dev/null +++ b/pkgs/tools/X11/xtruss/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "xtruss"; + version = "20181001.82973f5"; + + src = fetchurl { + url = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss/${pname}-${version}.tar.gz"; + sha256 = "1mm8k92zc318jk71wlf2r4rb723nd9lalhjl0pf48raiajb5ifgd"; + }; + + meta = with stdenv.lib; { + description = "easy-to-use X protocol tracing program"; + homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss; + license = licenses.mit; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index f611055a4341..4a0c244f07f7 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }: +{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper alsaLib gnome3.gtk gdk_pixbuf gnome3.adwaita-icon-theme + makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index fba85e0f5f00..262d3dd389eb 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, qttools, alsaLib }: stdenv.mkDerivation rec { - version = "2019-01-12"; + version = "1.5"; pname = "OPL3BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; - rev = "a254c923df5b385e140de6ae42cf4908af8728d3"; - sha256 = "181zkr2zkv9xy6zijbzqbqf4z6phg98ramzh9hmwi5zcbw68wkqw"; + rev = "v${version}"; + sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc"; fetchSubmodules = true; }; diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index e2b03e6f3822..8e55d24fc985 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "ncompress-4.2.4.4"; + name = "ncompress-4.2.4.5"; builder = ./builder.sh; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/project/ncompress/${name}.tar.gz"; - sha256 = "0yjiwv1hwb253x3m6r1dq2k7m5c9nz0ib2j7fnm3hark7y6s42xh"; + sha256 = "0fwhfijnzggqpbmln82zq7zp6sra7p9arfakswicwi7qsp6vnxgm"; }; meta = { diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 4d71d501b3c1..816c09161dcf 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.84"; + version = "1.85"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "1iafzlrqrjyphd1p74q5xzhgacc4gzijq8f6mdkvikbdsibch871"; + sha256 = "0sk2b7bxb2wzni1f39l4976dy47s7hqv62l7x7fwcjp62y22nw7m"; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 5a655b9ff162..883453379c4e 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, bash, curl, xsel }: stdenv.mkDerivation rec { - name = "imgurbash2-${version}"; - version = "2.1"; + pname = "imgurbash2"; + version = "3.1"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "1vdkyy0gvjqwc2g7a1lqx6cbynfxbd4f66m8sg1xjvd0kdpgi9wk"; + sha256 = "1hqghlk8c6svfszhmp02bhkc791lqhqffgiypf05giqmr5d8b9a9"; }; installPhase = '' diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 3115b1b72439..ffba2280e8a5 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake, boost165, pkgconfig, python35 , tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase , freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, pcre +, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, gtk3, pcre , bison, flex, libpthreadstubs, libX11 , embree2, makeWrapper, gsettings-desktop-schemas, glib , withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { flex libX11 libpthreadstubs python35 libXdmcp libxkbcommon epoxy at-spi2-core dbus doxygen # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gnome3.gtk + gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS gnome3.adwaita-icon-theme makeWrapper diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index b8bf73fda648..518b88e6d02a 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,53 +1,35 @@ -{ stdenv, fetchurl, imagemagickBig, pkgconfig, python2Packages, perl -, libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook +{ stdenv, fetchFromGitHub, imagemagickBig, pkgconfig, python2Packages, perl +, libX11, libv4l, qt5, lzma, gtk2, xmlto, docbook_xsl, autoreconfHook , enableVideo ? stdenv.isLinux }: let inherit (python2Packages) pygtk python; in stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "zbar"; - version = "0.10"; - src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${name}.tar.bz2"; - sha256 = "1imdvf5k34g1x2zr6975basczkz3zdxg6xnci50yyp5yvcwznki3"; + version = "0.22"; + + src = fetchFromGitHub { + owner = "mchehab"; + repo = "zbar"; + rev = version; + sha256 = "0pz0vq6a97vnc3lcjw9k12dk2awgmws46cjfh16zin0jiz18d1xq"; }; - patches = [ - (fetchpatch { - name = "0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/35182c3ac2430c986579b25f1826fe1b7dfd15de/debian!patches!0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch"; - sha256 = "1zy1wdyhmpw877pv6slfhjy0c6dm0gxli0i4zs1akpvh052j4a69"; - }) - (fetchpatch { - name = "python-zbar-import-fix-am.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/1f15f52e53ee0bf7b4761d673dc859c6b10e6be5/debian!patches!python-zbar-import-fix-am.patch"; - sha256 = "15xx9ms137hvwpynbgvbc6zgmmzfaf7331rfhls24rgbnywbgirx"; - }) - (fetchpatch { - name = "new_autotools_build_fix.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/2c641cc94d4f728421ed750d95d6d1c2d06a534d/debian!patches!new_autotools_build_fix.patch"; - sha256 = "0jhl5jnnjhfdv51xqimkbkdvj8d38z05fhd11yx1sgmw82f965s3"; - }) - (fetchpatch { - name = "threading-fix.patch"; - url = "https://git.recluse.de/raw/debian/pkg-zbar.git/d3eba6e2c3acb0758d19519015bf1a53ffb8e645/debian!patches!threading-fix.patch"; - sha256 = "1jjgrx9nc7788vfriai4z26mm106sg5ylm2w5rdyrwx7420x1wh7"; - }) + nativeBuildInputs = [ pkgconfig xmlto autoreconfHook docbook_xsl ]; + + buildInputs = [ + imagemagickBig python pygtk perl libX11 + ] ++ stdenv.lib.optionals enableVideo [ + libv4l gtk2 qt5.qtbase qt5.qtx11extras ]; - buildInputs = - [ imagemagickBig pkgconfig python pygtk perl libX11 - lzma autoreconfHook ] ++ - stdenv.lib.optionals enableVideo [ libv4l gtk2 qt4 ]; - - configureFlags = stdenv.lib.optionals (!enableVideo) [ + configureFlags = [ + "--with-dbusconfdir=$out/etc/dbus-1/system.d" + ] ++ stdenv.lib.optionals (!enableVideo) [ "--disable-video" "--without-gtk" "--without-qt" ]; - hardeningDisable = [ "fortify" ]; - meta = with stdenv.lib; { description = "Bar code reader"; longDescription = '' @@ -57,15 +39,9 @@ in stdenv.mkDerivation rec { EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR Code. ''; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ delroth raskin ]; platforms = platforms.unix; license = licenses.lgpl21; - homepage = http://zbar.sourceforge.net/; - }; - - passthru = { - updateInfo = { - downloadPage = "http://zbar.sourceforge.net/"; - }; + homepage = https://github.com/mchehab/zbar; }; } diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 99ba8e5e5159..fa7457b417e5 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.6"; + name = "brltty-6.0"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "06by51n35w0jq14w1vimxk3ssrlmiiw49wpxw29rasc106mpysfn"; + sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index aca449a4037b..a34dc0cdafe1 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "1hv9plgbwffdv94d8h6qlmazbwi56967wzqvfzr47iigbvx81vwj"; + sha256 = "1qi29qy4kwqfbca5ghdmjidpwn2wghr19jwzrrk0xvlq1xb13jfa"; }; cargoSha256 = "0cq78im3hg7wns260gwvajikj80l7kjbg3zycy3nvdx34llgv0n5"; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index e33376243bd6..05a312bb8bca 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, tzdata }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.4.6"; name = "dateutils-${version}"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; - sha256 = "1pnbc186mnvmyb5rndm0ym50sjihsy6m6crz62xxsjbxggza1mhn"; + sha256 = "1kaphw474lz7336awr9rzsgcsr1p9njsjsryd8i0ywg5g8qp3816"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 326192ff5bd1..0ba3472ae702 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -11,16 +11,16 @@ with rustPlatform; buildRustPackage rec { name = "ffsend-${version}"; - version = "0.2.38"; + version = "0.2.39"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "1kxxcqyilbhzcsnddlf7ha3dd57qj82yvbb9jsssimnlcskx84hx"; + sha256 = "0109g2h8673q6kx1lbci59zg9iczj676fvbip3sf1xfypvca22j9"; }; - cargoSha256 = "1qxvm2pz01na6nijdn0hlv5hxshiz3pfy6km7n9hjyakwi684a0l"; + cargoSha256 = "0yf9zfilj2whhnmbvh8p8vz4gkd8ds21gshylwp4ykqwv5p59nqq"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 04151812a078..77331a7f025a 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -3,12 +3,12 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { - name = "qt5ct-${version}"; - version = "0.37"; + pname = "qt5ct"; + version = "0.38"; src = fetchurl { - url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; - sha256 = "0n8csvbpislxjr2s1xi8r5a4q4bqn4kylcy2zws6w7z4m8pdzrny"; + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "0p0317z79h906qwaf0p8ga6lmr1dlabkx12gn31bv9lnp9f55jwg"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index c7d3d8219902..696074e2e889 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "06d2mh60qzm62gn06m1b4pvn9wq2jcna2prgzl69alb6fsfdyp7z"; + sha256 = "0ywrqfxxqv7mpm4szw8n3hcvc4jn9a490j9s7qh3vzqgrsx2sxk3"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0jypd49cha6fy8dwji7xqp2vsi2as20lk4zymx8z4ifqj0s2qjyb"; + cargoSha256 = "0vxyi7f5p9blv1isngvad8jrgpwmmv3dkr39qsb2i217jx3mzj2i"; patchPhase = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -D -m 555 bin/sk-tmux -t $out/bin - install -D -m 644 shell/skim.1 $out/man/man1/skim.1 + install -D -m 644 man/man1/* -t $out/man/man1 install -D -m 444 shell/* -t $out/share/skim install -D -m 444 plugin/skim.vim -t $vim/plugin diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index f14825968576..7796bb8cab0a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2019.03.01"; + version = "2019.03.18"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0bxk6adyppdv50jnp5cika8wc6wfgd6d8zbg1njgmcs1pxskllmf"; + sha256 = "0r31q7j3gg2zfw3b45jancxl7mmr2gin8dyfx5dgyyp92ss8hih7"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index a123e551a90a..3ff06960156a 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -2,14 +2,19 @@ stdenv.mkDerivation rec { name = "autossh-1.4g"; - + src = fetchurl { url = "http://www.harding.motd.ca/autossh/${name}.tgz"; sha256 = "0xqjw8df68f4kzkns5gcah61s5wk0m44qdk2z1d6388w6viwxhsz"; }; - - buildInputs = [ openssh ]; - + + preConfigure = '' + export ac_cv_func_malloc_0_nonnull=yes + export ac_cv_func_realloc_0_nonnull=yes + ''; + + nativeBuildInputs = [ openssh ]; + installPhase = '' install -D -m755 autossh $out/bin/autossh || return 1 @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { install -D -m644 rscreen $out/share/autossh/examples/rscreen || return 1 install -D -m644 autossh.1 $out/man/man1/autossh.1 || return 1 ''; - + meta = with stdenv.lib; { homepage = http://www.harding.motd.ca/autossh/; description = "Automatically restart SSH sessions and tunnels"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index b165142d85a4..45ff2947c685 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/curl-config "$dev" + '' + stdenv.lib.optionalString scpSupport '' sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la '' + stdenv.lib.optionalString gnutlsSupport '' ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 75e2b45110fe..f9df781715ac 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, which }: stdenv.mkDerivation rec { - name = "nbd-3.18"; + name = "nbd-3.19"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "0cb0sjiv0j9sh9dk24nrjm7sa0axbrcp2av5hc91g1ryzk764dyq"; + sha256 = "1446rdg490fxd8mg5gvrf4nddbw1w7lf2daxy9cpc19yy4968iml"; }; buildInputs = [ glib ] diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 4dbc455103c5..43018e401f1e 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "ndisc6-1.0.3"; + name = "ndisc6-1.0.4"; src = fetchurl { url = "https://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2"; - sha256 = "08f8xrsck2ykszp12yxx4ssf6wnkn7l6m59456hw3vgjyp5dch8g"; + sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index d7f558574065..17460bc72f70 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM -, gnome3, libsecret }: +, gtk3, gnome3, libsecret }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xhj5cipwbihf0cna8lpicpz7cd8fgkagpmg0xvj6pshymm5jbcd"; }; - buildInputs = [ networkmanager strongswanNM libsecret ] - ++ (with gnome3; [ gtk networkmanagerapplet ]); + buildInputs = [ networkmanager strongswanNM libsecret gtk3 gnome3.networkmanagerapplet ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 6779d864ce24..41c39cd27c26 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, - libappindicator-gtk3, gst_all_1, gnome3, wrapGAppsHook, aria2 ? null + libappindicator-gtk3, gst_all_1, gtk3, gnome3, wrapGAppsHook, aria2 ? null }: stdenv.mkDerivation rec { @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { intltool wrapGAppsHook ]; - + buildInputs = [ openssl curl libnotify libappindicator-gtk3 - gnome3.gtk + gtk3 (stdenv.lib.getLib gnome3.dconf) ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index b9454e64ccf7..21e869b7b01e 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake, autoconf, automake, libtool -, wget, xxd, desktop-file-utils -, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive +, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper +, wget, xxd, desktop-file-utils, file +, gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive , squashfsTools , gtest }: @@ -72,9 +72,13 @@ in stdenv.mkDerivation rec { buildInputs = [ glib zlib cairo openssl fuse xz inotify-tools libarchive - squashfsTools + squashfsTools makeWrapper ]; + postPatch = '' + substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file" + ''; + preConfigure = '' export HOME=$(pwd) ''; @@ -89,6 +93,14 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_MKSQUASHFS=ON" ]; + postInstall = '' + cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" + cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" + + wrapProgram "$out/bin/appimagetool" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}" + ''; + checkInputs = [ gtest ]; doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix new file mode 100644 index 000000000000..c5844702ef38 --- /dev/null +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -0,0 +1,34 @@ +{ stdenv, afl}: + +stdenv.mkDerivation rec { + version = (builtins.parseDrvName afl.name).version; + name = "libdislocator-${version}"; + + src = afl.src; + sourceRoot = "${afl.name}/libdislocator"; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/lib/afl + ''; + postInstall = '' + mkdir $out/bin + cat > $out/bin/get-libdislocator-so < pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.14"; + version = "2.2.15"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0yzqrg24j9fc4f8ss5pclyvg70a9z53sv89vl77xii8yvi3fvy8v"; + sha256 = "0m6lyphbb20i84isdxzfhcbzyc682hdrdv4aqkzmhrdksycf536b"; }; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext texinfo @@ -36,7 +38,13 @@ stdenv.mkDerivation rec { ''; #" fix Emacs syntax highlighting :-( pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; - configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; + configureFlags = [ + "--with-libgpg-error-prefix=${libgpgerror.dev}" + "--with-libgcrypt-prefix=${libgcrypt.dev}" + "--with-libassuan-prefix=${libassuan.dev}" + "--with-ksba-prefix=${libksba.dev}" + "--with-npth-prefix=${npth}" + ] ++ optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}"; postInstall = '' mkdir -p $out/lib/systemd/user diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 4db350684bef..0415b10b25d8 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -2,15 +2,14 @@ , bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "lastpass-cli-${version}"; - - version = "1.3.1"; + pname = "lastpass-cli"; + version = "1.3.2"; src = fetchFromGitHub { owner = "lastpass"; - repo = "lastpass-cli"; + repo = pname; rev = "v${version}"; - sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h"; + sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; @@ -21,11 +20,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions" - ]; + installTargets = [ "install" "install-doc" ]; - installTargets = "install install-doc"; + postInstall = '' + install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass + install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish + ''; meta = with lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely"; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 007ffdf3e3fa..8ddbd60a38d1 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -73,6 +73,9 @@ let # Link extensions env rmdir $out/lib/password-store/extensions ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/. + for f in ${extensionsEnv}/share/man/man1/*.1.gz; do + ln -s $f $out/share/man/man1/ + done # Fix program name in --help substituteInPlace $out/bin/pass \ diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 362545285ede..282729f31459 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.25.2"; + name = "monit-5.25.3"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0jn6mdsh50zd3jc61hr1y8sd80r01gqcyvd860zf8m8i3lvfc35a"; + sha256 = "0s8577ixcmx45b081yx6cw54iq7m5yzpq3ir616qc84xhg45h0n1"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix new file mode 100644 index 000000000000..31184e11399b --- /dev/null +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -0,0 +1,30 @@ +{ stdenv, ocaml, makeWrapper, fetchsvn, ghostscript, imagemagick, perl, poppler_utils, tesseract, unpaper }: + +stdenv.mkDerivation rec { + version = "0.1.7"; + pname = "pdfsandwich"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/pdfsandwich/code/trunk/src"; + rev = "75"; + sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6"; + }; + + buildInputs = [ ocaml perl makeWrapper]; + installPhase = '' + mkdir -p $out/bin + cp -p pdfsandwich $out/bin + wrapProgram $out/bin/pdfsandwich --prefix PATH : ${stdenv.lib.makeBinPath [ imagemagick ghostscript poppler_utils unpaper tesseract ]} + + mkdir -p $out/man/man1 + cp -p pdfsandwich.1.gz $out/man/man1 + ''; + +meta = with stdenv.lib; { + description = "OCR tool for scanned PDFs"; + homepage = http://www.tobias-elze.de/pdfsandwich/; + license = licenses.gpl2; + maintainers = [ maintainers.rps ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 7a06689c5e66..1a0a9b877bfe 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -87,7 +87,8 @@ in buildEnv { export TEXMFSYSVAR="$out/share/texmf-var" export PERL5LIB="$out/share/texmf/scripts/texlive" '' + - # patch texmf-{dist,local} -> texmf to be sure + # patch texmf-dist -> $out/share/texmf + # patch texmf-local -> $out/share/texmf-local # TODO: perhaps do lua actions? # tried inspiration from install-tl, sub do_texmf_cnf '' @@ -99,8 +100,7 @@ in buildEnv { rm ./texmfcnf.lua sed \ -e 's,texmf-dist,texmf,g' \ - -e 's,texmf-local,texmf,g' \ - -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf\",g" \ + -e "s,\(TEXMFLOCAL[ ]*=[ ]*\)[^\,]*,\1\"$out/share/texmf-local\",g" \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,selfautodir:/,$out/share/,g" \ -e "s,selfautodir:,$out/share/,g" \ @@ -116,7 +116,6 @@ in buildEnv { rm ./texmf.cnf sed \ -e 's,texmf-dist,texmf,g' \ - -e 's,texmf-local,texmf,g' \ -e "s,\$SELFAUTOLOC,$out,g" \ -e "s,\$SELFAUTODIR,$out/share,g" \ -e "s,\$SELFAUTOPARENT,$out/share,g" \ @@ -126,6 +125,8 @@ in buildEnv { patchCnfLua "./texmfcnf.lua" + mkdir $out/share/texmf-local + rm updmap.cfg ) '' + diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix new file mode 100644 index 000000000000..590e5704b88d --- /dev/null +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "rootlesskit-${version}"; + version = "0.3.0-alpha.2"; + goPackagePath = "github.com/rootless-containers/rootlesskit"; + + src = fetchFromGitHub { + owner = "rootless-containers"; + repo = "rootlesskit"; + rev = "v${version}"; + sha256 = "11y4hcrpayyyi9j3b80ilccxs5bbwnqfpi5nsjgmjb9v01z35fw6"; + }; + + meta = with lib; { + homepage = https://github.com/rootless-containers/rootlesskit; + description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user''; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 96396acb9e62..fac60ece8108 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -49,11 +49,6 @@ mapAliases ({ bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 - buildbot = pythonPackages.buildbot; # added 2018-10-11 - buildbot-full = pythonPackages.buildbot-full; # added 2018-10-11 - buildbot-pkg = pythonPackages.buildbot-pkg; # added 2018-10-11 - buildbot-ui = pythonPackages.buildbot-ui; # added 2018-10-11 - buildbot-worker = pythonPackages.buildbot-worker; # added 2018-10-11 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2435513acbe0..3d3cf0da19b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25,9 +25,6 @@ let in { - # Allow callPackage to fill in the pkgs argument - inherit pkgs; - # A stdenv capable of building 32-bit binaries. On x86_64-linux, # it uses GCC compiled with multilib support; on i686-linux, it's # just the plain stdenv. @@ -259,6 +256,7 @@ in curl = buildPackages.curl.override rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; + zlib = buildPackages.zlib.override { fetchurl = stdenv.fetchurlBoot; }; pkgconfig = buildPackages.pkgconfig.override { fetchurl = stdenv.fetchurlBoot; }; perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { @@ -268,7 +266,7 @@ in }; libssh2 = buildPackages.libssh2.override { fetchurl = stdenv.fetchurlBoot; - inherit openssl; + inherit zlib openssl; }; # On darwin, libkrb5 needs bootstrap_cmds which would require # converting many packages to fetchurl_boot to avoid evaluation cycles. @@ -280,7 +278,7 @@ in }; nghttp2 = buildPackages.nghttp2.override { fetchurl = stdenv.fetchurlBoot; - inherit pkgconfig openssl; + inherit zlib pkgconfig openssl; c-ares = buildPackages.c-ares.override { fetchurl = stdenv.fetchurlBoot; }; libev = buildPackages.libev.override { fetchurl = stdenv.fetchurlBoot; }; }; @@ -477,6 +475,8 @@ in stdenv = clangStdenv; }; + libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; + afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; agrep = callPackage ../tools/text/agrep { }; @@ -673,6 +673,11 @@ in bonfire = callPackage ../tools/misc/bonfire { }; + buildbot = with python3Packages; toPythonApplication buildbot; + buildbot-ui = with python3Packages; toPythonApplication buildbot-ui; + buildbot-full = with python3Packages; toPythonApplication buildbot-full; + buildbot-worker = with python3Packages; toPythonApplication buildbot-worker; + bunny = callPackage ../tools/package-management/bunny { }; chezmoi = callPackage ../tools/misc/chezmoi { }; @@ -1355,7 +1360,7 @@ in dtrx = callPackage ../tools/compression/dtrx { }; - dune = callPackage ../development/tools/ocaml/dune { }; + inherit (ocamlPackages) dune; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -2439,7 +2444,7 @@ in duo-unix = callPackage ../tools/security/duo-unix { }; duplicacy = callPackage ../tools/backup/duplicacy { }; - + duplicati = callPackage ../tools/backup/duplicati { }; duplicity = callPackage ../tools/backup/duplicity { @@ -3557,6 +3562,8 @@ in intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; @@ -3672,6 +3679,8 @@ in jp2a = callPackage ../applications/misc/jp2a { }; + jpeg-archive = callPackage ../applications/graphics/jpeg-archive { }; + jpeginfo = callPackage ../applications/graphics/jpeginfo { }; jpegoptim = callPackage ../applications/graphics/jpegoptim { }; @@ -4849,6 +4858,8 @@ in parted = callPackage ../tools/misc/parted { }; + paulstretch = callPackage ../applications/audio/paulstretch { }; + pell = callPackage ../applications/misc/pell { }; pepper = callPackage ../tools/admin/salt/pepper { }; @@ -4906,6 +4917,8 @@ in pdfcrack = callPackage ../tools/security/pdfcrack { }; + pdfsandwich = callPackage ../tools/typesetting/pdfsandwich { }; + pdftag = callPackage ../tools/graphics/pdftag { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -5245,6 +5258,8 @@ in redsocks = callPackage ../tools/networking/redsocks { }; + retext = callPackage ../applications/editors/retext { }; + richgo = callPackage ../development/tools/richgo { }; rst2html5 = callPackage ../tools/text/rst2html5 { }; @@ -8504,6 +8519,8 @@ in bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazelisk = callPackage ../development/tools/bazelisk { }; + buildBazelPackage = callPackage ../build-support/build-bazel-package { }; bear = callPackage ../development/tools/build-managers/bear { }; @@ -8550,6 +8567,8 @@ in byacc = callPackage ../development/tools/parsing/byacc { }; + cadre = callPackage ../development/tools/cadre { }; + casperjs = callPackage ../development/tools/casperjs { inherit (texFunctions) fontsConf; }; @@ -9910,6 +9929,7 @@ in libjack2 = if stdenv.isDarwin then null else libjack2; libmodplug = if stdenv.isDarwin then null else libmodplug; openal = if stdenv.isDarwin then null else openal; + libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; vid-stab = if stdenv.isDarwin then null else vid-stab; @@ -10869,9 +10889,7 @@ in libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { }; - libunity = callPackage ../development/libraries/libunity { - inherit (gnome3) gnome-common; - }; + libunity = callPackage ../development/libraries/libunity { }; libdbusmenu = callPackage ../development/libraries/libdbusmenu { }; libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; }; @@ -13625,10 +13643,9 @@ in apcupsd = callPackage ../servers/apcupsd { }; - asterisk = asterisk-stable; - inherit (callPackages ../servers/asterisk { }) - asterisk-stable asterisk-lts; + asterisk asterisk-stable asterisk-lts + asterisk_13 asterisk_15 asterisk_16; sabnzbd = callPackage ../servers/sabnzbd { }; @@ -14794,13 +14811,6 @@ in ]; }; - linux_4_20 = callPackage ../os-specific/linux/kernel/linux-4.20.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - linux_5_0 = callPackage ../os-specific/linux/kernel/linux-5.0.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14882,6 +14892,8 @@ in ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; + it87 = callPackage ../os-specific/linux/it87 {}; + ena = callPackage ../os-specific/linux/ena {}; v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; @@ -15001,7 +15013,6 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_4_20 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_20); linuxPackages_5_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_0); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -15407,6 +15418,8 @@ in speedometer = callPackage ../os-specific/linux/speedometer { }; + statik = callPackage ../development/tools/statik { }; + statifier = callPackage ../os-specific/linux/statifier { }; sysdig = callPackage ../os-specific/linux/sysdig { @@ -16512,6 +16525,8 @@ in notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; + brig = callPackages ../applications/networking/brig { }; + bristol = callPackage ../applications/audio/bristol { }; bs1770gain = callPackage ../applications/audio/bs1770gain { }; @@ -19339,6 +19354,8 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; + rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; + rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { @@ -20545,6 +20562,8 @@ in xtrace = callPackage ../tools/X11/xtrace { }; + xtruss = callPackage ../tools/X11/xtruss { }; + xmacro = callPackage ../tools/X11/xmacro { }; xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; @@ -21077,7 +21096,9 @@ in pacvim = callPackage ../games/pacvim { }; - performous = callPackage ../games/performous { }; + performous = callPackage ../games/performous { + boost = boost166; + }; pingus = callPackage ../games/pingus {}; @@ -21551,6 +21572,8 @@ in gtk = gtk2; }; + solarc-gtk-theme = callPackage ../misc/themes/solarc { }; + xfce = xfce4-12; xfceUnstable = xfce4-13; @@ -21668,6 +21691,8 @@ in igv = callPackage ../applications/science/biology/igv { }; inormalize = callPackage ../applications/science/biology/inormalize { }; + + itsx = callPackage ../applications/science/biology/itsx { }; iv = callPackage ../applications/science/biology/iv { neuron-version = neuron.version; @@ -21693,6 +21718,8 @@ in mrbayes = callPackage ../applications/science/biology/mrbayes { }; + messer-slim = callPackage ../applications/science/biology/messer-slim { }; + minc_tools = callPackage ../applications/science/biology/minc-tools { }; minc_widgets = callPackage ../applications/science/biology/minc-widgets { }; @@ -22610,6 +22637,8 @@ in illum = callPackage ../tools/system/illum { }; + image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -23145,6 +23174,8 @@ in vaultenv = haskellPackages.vaultenv; + vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; + vbam = callPackage ../misc/emulators/vbam { ffmpeg = ffmpeg_2; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 46a00b698e34..5907b0099dd3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -223,6 +223,8 @@ let dtoa = callPackage ../development/ocaml-modules/dtoa { }; + dune = callPackage ../development/tools/ocaml/dune { }; + earley = callPackage ../development/ocaml-modules/earley { }; earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { }; @@ -355,9 +357,7 @@ let lablgl = callPackage ../development/ocaml-modules/lablgl { }; - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { - cairo2 = cairo2.override { enableGtkSupport = false; }; - }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; @@ -381,6 +381,8 @@ let labltk = callPackage ../development/ocaml-modules/labltk { }; + lacaml = callPackage ../development/ocaml-modules/lacaml { }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; lambdaTerm = if lib.versionOlder "4.02" ocaml.version diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 165064414048..ba4ce18f04df 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -253,23 +253,24 @@ let }; composer = pkgs.stdenv.mkDerivation rec { - name = "composer-${version}"; - version = "1.8.0"; + pname = "composer"; + version = "1.8.4"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089"; + sha256 = "12h5vqwhklxvwrplggzjl21n6kb972pwkj9ivmn2vbxyixn848hp"; }; unpackPhase = ":"; - buildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ - --add-flags "$out/libexec/composer/composer.phar" + --add-flags "$out/libexec/composer/composer.phar" \ + --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; meta = with pkgs.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20b77c87108c..d3463a6a5ed1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1749,6 +1749,8 @@ in { dmenu-python = callPackage ../development/python-modules/dmenu { }; + dnslib = callPackage ../development/python-modules/dnslib { }; + dnspython = callPackage ../development/python-modules/dnspython { }; dns = self.dnspython; # Alias for compatibility, 2017-12-10 @@ -3122,6 +3124,8 @@ in { marisa-trie = callPackage ../development/python-modules/marisa-trie { }; + Markups = callPackage ../development/python-modules/Markups { }; + markupsafe = callPackage ../development/python-modules/markupsafe { }; marshmallow = callPackage ../development/python-modules/marshmallow { }; @@ -3928,6 +3932,8 @@ in { purepng = callPackage ../development/python-modules/purepng { }; + pyhocon = callPackage ../development/python-modules/pyhocon { }; + pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; @@ -3958,6 +3964,8 @@ in { pysvn = callPackage ../development/python-modules/pysvn { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; python-wifi = callPackage ../development/python-modules/python-wifi { }; diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix index ec6ed357c688..a093442d3698 100644 --- a/pkgs/top-level/splice.nix +++ b/pkgs/top-level/splice.nix @@ -96,19 +96,20 @@ let } @ args: if actuallySplice then spliceReal args else pkgsHostTarget; - splicedPackages = splicePackages rec { - pkgsBuildBuild = pkgs.buildPackages.buildPackages; - pkgsBuildHost = pkgs.buildPackages; - pkgsBuildTarget = - if pkgs.stdenv.targetPlatform == pkgs.stdenv.hostPlatform - then pkgsBuildHost - else assert pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; pkgsHostTarget; - pkgsHostHost = {}; # unimplemented - pkgsHostTarget = pkgs; - pkgsTargetTarget = pkgs.targetPackages; + splicedPackages = splicePackages { + inherit (pkgs) + pkgsBuildBuild pkgsBuildHost pkgsBuildTarget + pkgsHostHost pkgsHostTarget + pkgsTargetTarget + ; } // { # These should never be spliced under any circumstances - inherit (pkgs) pkgs buildPackages targetPackages; + inherit (pkgs) + pkgsBuildBuild pkgsBuildHost pkgsBuildTarget + pkgsHostHost pkgsHostTarget + pkgsTargetTarget + buildPackages pkgs targetPackages + ; inherit (pkgs.stdenv) buildPlatform targetPlatform hostPlatform; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 0ee5c25b0101..9f4b63293ef6 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -21,18 +21,23 @@ ## Other parameters ## -, # The package set used at build-time. If null, `buildPackages` will - # be defined internally as the final produced package set itself. This allows - # us to avoid expensive splicing. - buildPackages - -, # The package set used in the next stage. If null, `targetPackages` will be - # defined internally as the final produced package set itself, just like with - # `buildPackages` and for the same reasons. +, # Either null or an object in the form: # - # THIS IS A HACK for compilers that don't think critically about cross- - # compilation. Please do *not* use unless you really know what you are doing. - targetPackages + # { + # pkgsBuildBuild = ...; + # pkgsBuildHost = ...; + # pkgsBuildTarget = ...; + # pkgsHostHost = ...; + # # pkgsHostTarget skipped on purpose. + # pkgsTargetTarget ...; + # } + # + # These are references to adjacent bootstrapping stages. The more familiar + # `buildPackages` and `targetPackages` are defined in terms of them. If null, + # they are instead defined internally as the current stage. This allows us to + # avoid expensive splicing. `pkgsHostTarget` is skipped because it is always + # defined as the current stage. + adjacentPackages , # The standard environment to use for building packages. stdenv @@ -70,11 +75,33 @@ let inherit (self) runtimeShell; }; - stdenvBootstappingAndPlatforms = self: super: { - buildPackages = (if buildPackages == null then self else buildPackages) - // { recurseForDerivations = false; }; - targetPackages = (if targetPackages == null then self else targetPackages) + stdenvBootstappingAndPlatforms = self: super: let + withFallback = thisPkgs: + (if adjacentPackages == null then self else thisPkgs) // { recurseForDerivations = false; }; + in { + # Here are package sets of from related stages. They are all in the form + # `pkgs{theirHost}{theirTarget}`. For example, `pkgsBuildHost` means their + # host platform is our build platform, and their target platform is our host + # platform. We only care about their host/target platforms, not their build + # platform, because the the former two alone affect the interface of the + # final package; the build platform is just an implementation detail that + # should not leak. + pkgsBuildBuild = withFallback adjacentPackages.pkgsBuildBuild; + pkgsBuildHost = withFallback adjacentPackages.pkgsBuildHost; + pkgsBuildTarget = withFallback adjacentPackages.pkgsBuildTarget; + pkgsHostHost = withFallback adjacentPackages.pkgsHostHost; + pkgsHostTarget = self // { recurseForDerivations = false; }; # always `self` + pkgsTargetTarget = withFallback adjacentPackages.pkgsTargetTarget; + + # Older names for package sets. Use these when only the host platform of the + # package set matter (i.e. use `buildPackages` where any of `pkgsBuild*` + # would do, and `targetPackages` when any of `pkgsTarget*` would do (if we + # had more than just `pkgsTargetTarget`).) + buildPackages = self.pkgsBuildHost; + pkgs = self.pkgsHostTarget; + targetPackages = self.pkgsTargetTarget; + inherit stdenv; }; @@ -87,7 +114,7 @@ let inherit (hostPlatform) system; }; - splice = self: super: import ./splice.nix lib self (buildPackages != null); + splice = self: super: import ./splice.nix lib self (adjacentPackages != null); allPackages = self: super: let res = import ./all-packages.nix @@ -135,6 +162,9 @@ let # default GNU libc on Linux systems. Non-Linux systems are not # supported. pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun { + overlays = [ (self': super': { + pkgsMusl = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -151,6 +181,9 @@ let # All packages built for i686 Linux. # Used by wine, firefox with debugging version of Flash, ... pkgsi686Linux = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { + overlays = [ (self': super': { + pkgsi686Linux = super'; + })] ++ overlays; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { parsed = stdenv.hostPlatform.parsed // { @@ -176,6 +209,9 @@ let # Fully static packages. # Currently uses Musl on Linux (couldn’t get static glibc to work). pkgsStatic = nixpkgsFun ({ + overlays = [ (self': super': { + pkgsStatic = super'; + })] ++ overlays; crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = {