diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-02 00:22:12 +0000 |
| commit | fda26c8476c1684f77bacacf2b5c46b1fbf65b41 (patch) | |
| tree | 84752640ad3cf64ba372bdd4aab713c097023281 /pkgs/development/web | |
| parent | 21976d1fbd612f67825473a7a2b05bb1387e5840 (diff) | |
| parent | 6b8806dff7a2cd11e37944af1bbb276ceb870199 (diff) | |
| download | nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.gz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.bz2 nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.lz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.xz nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.tar.zst nixlib-fda26c8476c1684f77bacacf2b5c46b1fbf65b41.zip | |
Merge branch 'master' into staging
* master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/kore/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v8.nix | 4 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix new file mode 100644 index 000000000000..eac2046a233d --- /dev/null +++ b/pkgs/development/web/kore/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, openssl }: + +stdenv.mkDerivation rec { + name = "kore-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "jorisvink"; + repo = "kore"; + rev = "${version}-release"; + sha256 = "1jjhx9gfjzpsrs7b9rgb46k6v03azrxz9fq7vkn9zyz6zvnjj614"; + }; + + buildInputs = [ openssl ]; + + postPatch = '' + # Do not require kore to be on PATH when it launches itself as a subprocess. + sed -ie "s+\"kore\"+\"$out/bin/kore\"+" src/cli.c + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An easy to use web application framework for C"; + homepage = https://kore.io; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ johnmh ]; + }; +} diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 244c236cd18b..013cab8f57bc 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.5.0"; + version = "8.6.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "0g2wyy9zdjzm9c0vbjn8bn49s1b2c7r2iwdfc4dpx7h4wpcfbkg1"; + sha256 = "14vy9xnyfz44j460hkrx423g7acpzzyqlxiv6sgmna9qj8872w5i"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; |