diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-25 09:13:36 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-11-25 09:13:36 +0100 |
| commit | d087463b4876fb61972420cb652068bc3f39bf2e (patch) | |
| tree | aee00800af9f3a4669f6c1d96445ed0f8a7e4d4d /pkgs/servers | |
| parent | c06bc732222b62613f4eefd9fde2c61567ae9737 (diff) | |
| parent | 45a85eacebf2181d2e12c0c1005bf3ba07583a74 (diff) | |
| download | nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.tar nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.tar.gz nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.tar.bz2 nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.tar.lz nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.tar.xz nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.tar.zst nixlib-d087463b4876fb61972420cb652068bc3f39bf2e.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/wordpress/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 5043c36f8c20..972bd53d95ee 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,6 +11,10 @@ buildGoPackage rec { sha256 = "048ap70hdfkxhy0y8q1jsb0lql1i99jnf3cqaqar6qs2ynzsw9hd"; }; + buildFlagsArray = [ ''-ldflags= + -X main.version=${version} + '' ]; + goPackagePath = "github.com/influxdata/influxdb"; excludedPackages = "test"; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index bb07c42b872c..d8dde97a0969 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,8 +2,8 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.8.3"; - sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p"; + rev = "4.9"; + sha256 = "1qffh413k8c1mf3jj9hys3a7y1qfjcg2w96w4c9x3ida3lchg7ln"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; |