servers: replace name with pname&version

This commit is contained in:
Felix Buehler 2021-07-25 23:53:02 +02:00
parent e1533b22af
commit a56d117bdb
53 changed files with 114 additions and 105 deletions

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "adguardhome"; pname = "adguardhome";
version = "0.106.3"; version = "0.106.3";
src = fetchurl { src = fetchurl {

View file

@ -6,10 +6,10 @@ assert enableCgiScripts -> gd != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "apcupsd"; pname = "apcupsd";
name = "${pname}-3.14.14"; version = "3.14.14";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv";
}; };

View file

@ -1,10 +1,7 @@
{ lib, stdenv, fetchFromGitHub, slurm } : { lib, stdenv, fetchFromGitHub, slurm } :
let stdenv.mkDerivation rec {
pname = "slurm-spank-x11";
version = "0.2.5"; version = "0.2.5";
in
stdenv.mkDerivation {
name = "slurm-spank-x11-${version}";
version = version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hautreux"; owner = "hautreux";

View file

@ -32,7 +32,7 @@ let
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "domoticz"; pname = "domoticz";
inherit version; inherit version;
src = domoticz-src; src = domoticz-src;

View file

@ -2,11 +2,12 @@
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. # !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "bsd-fingerd-0.17"; pname = "bsd-fingerd";
version = "0.17";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz"; url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
}; };

View file

@ -1,14 +1,11 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
let stdenv.mkDerivation rec {
pname = "bftpd"; pname = "bftpd";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "5.9"; version = "5.9";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY="; sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY=";
}; };

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, openssl, fetchpatch }: { lib, stdenv, fetchurl, openssl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pure-ftpd-1.0.49"; pname = "pure-ftpd";
version = "1.0.49";
src = fetchurl { src = fetchurl {
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz"; url = "https://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${version}.tar.gz";
sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn"; sha256 = "19cjr262n6h560fi9nm7l1srwf93k34bp8dp1c6gh90bqxcg8yvn";
}; };

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libcap, openssl, pam }: { lib, stdenv, fetchurl, libcap, openssl, pam }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vsftpd-3.0.3"; pname = "vsftpd";
version = "3.0.3";
src = fetchurl { src = fetchurl {
url = "https://security.appspot.com/downloads/${name}.tar.gz"; url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz";
sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx"; sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx";
}; };

View file

@ -3,7 +3,7 @@
}: }:
yarn2nix-moretea.mkYarnPackage rec { yarn2nix-moretea.mkYarnPackage rec {
name = "gotify-ui"; pname = "gotify-ui";
packageJSON = ./package.json; packageJSON = ./package.json;
yarnNix = ./yarndeps.nix; yarnNix = ./yarndeps.nix;

View file

@ -5,10 +5,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpm-1.20.7"; pname = "gpm";
version = "1.20.7";
src = fetchurl { src = fetchurl {
url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; url = "https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.bz2";
sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh";
}; };

View file

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hashi-ui"; pname = "hashi-ui";
version = "1.3.8"; version = "1.3.8";
src = fetchurl { src = fetchurl {

View file

@ -1,7 +1,7 @@
{ buildGoModule, hasura-graphql-engine }: { buildGoModule, hasura-graphql-engine }:
buildGoModule rec { buildGoModule rec {
name = "hasura-${version}"; pname = "hasura";
version = hasura-graphql-engine.version; version = hasura-graphql-engine.version;
src = hasura-graphql-engine.src; src = hasura-graphql-engine.src;

View file

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitHub }: { lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
name = "holochain-go${version}"; pname = "holochain-go";
version = "0.1.0-alpha"; version = "0.1.0-alpha";
rev = "a17510b910a7a377441c152b8dccdbae1999f63f"; rev = "a17510b910a7a377441c152b8dccdbae1999f63f";

View file

@ -1,17 +1,15 @@
{ lib, stdenv, fetchurl, apacheHttpd }: { lib, stdenv, fetchurl, apacheHttpd }:
let let
version = "2.4.7.1";
apache-24-patch = fetchurl { apache-24-patch = fetchurl {
name = "compile-against-apache24.diff"; name = "compile-against-apache24.diff";
url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42";
sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "mod_fastcgi"; pname = "mod_fastcgi";
inherit version; version = "2.4.7.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";

View file

@ -1,11 +1,12 @@
{ lib, stdenv, mysql_jdbc }: { lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "jboss-mysql-jdbc"; pname = "jboss-mysql-jdbc";
builder = ./builder.sh; builder = ./builder.sh;
inherit mysql_jdbc; inherit mysql_jdbc;
version = mysql_jdbc.version;
meta = { meta = {
platforms = lib.platforms.unix; platforms = lib.platforms.unix;

View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "micro-httpd-20140814"; pname = "micro-httpd";
version = "20140814";
src = fetchurl { src = fetchurl {
url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz"; url = "https://acme.com/software/micro_httpd/micro_httpd_14Aug2014.tar.gz";

View file

@ -2,10 +2,11 @@
, librdf_rasqal }: , librdf_rasqal }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "redstore-0.5.4"; pname = "redstore";
version = "0.5.4";
src = fetchurl { src = fetchurl {
url = "https://www.aelius.com/njh/redstore/${name}.tar.gz"; url = "https://www.aelius.com/njh/redstore/redstore-${version}.tar.gz";
sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq";
}; };

View file

@ -1,11 +1,12 @@
{ lib, stdenv, mysql_jdbc }: { lib, stdenv, mysql_jdbc }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tomcat-mysql-jdbc"; pname = "tomcat-mysql-jdbc";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [ mysql_jdbc ]; buildInputs = [ mysql_jdbc ];
inherit mysql_jdbc; inherit mysql_jdbc;
version = mysql_jdbc.version;
meta = { meta = {
platforms = lib.platforms.unix; platforms = lib.platforms.unix;

View file

@ -3,10 +3,11 @@
, libvorbis, libtheora, speex, libkate, libopus }: , libvorbis, libtheora, speex, libkate, libopus }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icecast-2.4.4"; pname = "icecast";
version = "2.4.4";
src = fetchurl { src = fetchurl {
url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; url = "http://downloads.xiph.org/releases/icecast/icecast-${version}.tar.gz";
sha256 = "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9"; sha256 = "0i2d9rhav0x6js2qhjf5iy6j2a7f0d11ail0lfv40hb1kygrgda9";
}; };

View file

@ -4,12 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icingaweb2-theme-april"; pname = "icingaweb2-theme-april";
version = "1.0.4"; version = "1.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mikesch-mp"; owner = "Mikesch-mp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g"; sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g";
}; };

View file

@ -4,12 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icingaweb2-theme-lsd"; pname = "icingaweb2-theme-lsd";
version = "1.0.3"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mikesch-mp"; owner = "Mikesch-mp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w"; sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w";
}; };

View file

@ -4,12 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icingaweb2-theme-particles"; pname = "icingaweb2-theme-particles";
version = "1.0.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mikesch-mp"; owner = "Mikesch-mp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy"; sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy";
}; };

View file

@ -4,12 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icingaweb2-theme-snow"; pname = "icingaweb2-theme-snow";
version = "1.0.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mikesch-mp"; owner = "Mikesch-mp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp"; sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp";
}; };

View file

@ -4,12 +4,12 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icingaweb2-theme-spring"; pname = "icingaweb2-theme-spring";
version = "1.0.0"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mikesch-mp"; owner = "Mikesch-mp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9"; sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9";
}; };

View file

@ -5,13 +5,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icingaweb2-theme-unicorn"; pname = "icingaweb2-theme-unicorn";
version = "1.0.2"; version = "1.0.2";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "Mikesch-mp"; owner = "Mikesch-mp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05"; sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05";
}) })

View file

@ -1,12 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: { lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "charybdis-4.1.2"; pname = "charybdis";
version = "4.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "charybdis-ircd"; owner = "charybdis-ircd";
repo = "charybdis"; repo = "charybdis";
rev = name; rev = "${pname}-${version}";
sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3";
}; };

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, openssl, zlib }: { lib, stdenv, fetchurl, openssl, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ircd-hybrid-8.2.36"; pname = "ircd-hybrid";
version = "8.2.36";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz";
sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv"; sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv";
}; };

View file

@ -9,7 +9,7 @@
# * Update `version`+`hash` and rebuild. # * Update `version`+`hash` and rebuild.
mkYarnPackage rec { mkYarnPackage rec {
name = "grafana-image-renderer"; pname = "grafana-image-renderer";
version = "3.0.0"; version = "3.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -2,7 +2,8 @@
buildGoPackage rec { buildGoPackage rec {
rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133"; rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133";
name = "heapster-${lib.strings.substring 0 7 rev}"; pname = "heapster";
version = lib.strings.substring 0 7 rev;
goPackagePath = "k8s.io/heapster"; goPackagePath = "k8s.io/heapster";
subPackages = [ "./" ]; subPackages = [ "./" ];

View file

@ -1,16 +1,13 @@
{ lib, stdenv, fetchurl, jre, makeWrapper }: { lib, stdenv, fetchurl, jre, makeWrapper }:
let stdenv.mkDerivation rec {
pname = "jmx-prometheus-httpserver";
version = "0.15.0"; version = "0.15.0";
jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
in stdenv.mkDerivation {
inherit version jarName;
name = "jmx-prometheus-httpserver-${version}"; jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar";
src = fetchurl { src = fetchurl {
url = mavenUrl; url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}";
sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz"; sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz";
}; };

View file

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3Packages, nixosTests }: { lib, fetchFromGitHub, python3Packages, nixosTests }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "tor-exporter-${version}"; pname = "tor-exporter";
version = "0.4"; version = "0.4";
# Just a single .py file to use as the application's main entry point. # Just a single .py file to use as the application's main entry point.

View file

@ -1,11 +1,9 @@
{ lib, stdenv, fetchurl, imake, bison, flex, gccmakedep { lib, stdenv, fetchurl, imake, bison, flex, gccmakedep
, xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: , xorgproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }:
let stdenv.mkDerivation rec {
pname = "nas"; pname = "nas";
version = "1.9.4"; version = "1.9.4";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz";

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }: { lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, pythonPackages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "neard-0.16"; pname = "neard";
version = "0.16";
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/${name}.tar.gz"; url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz";
sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil";
}; };

View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, pcre }: { lib, stdenv, fetchurl, pcre }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "leafnode-2.0.0.alpha20121101a.12"; pname = "leafnode";
version = "2.0.0.alpha20121101a.12";
src = fetchurl { src = fetchurl {
url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2"; url = "http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20121101a.tar.bz2";

View file

@ -1,7 +1,7 @@
{ lib, fetchurl, python3Packages, php }: { lib, fetchurl, python3Packages, php }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "nextcloud-news-updater-${version}"; pname = "nextcloud-news-updater";
version = "10.0.1"; version = "10.0.1";
src = fetchurl { src = fetchurl {

View file

@ -5,7 +5,7 @@ with lib;
let let
np = nodePackages.override { generated = ./package.nix; self = np; }; np = nodePackages.override { generated = ./package.nix; self = np; };
in nodePackages.buildNodePackage rec { in nodePackages.buildNodePackage rec {
name = "ripple-data-api-${version}"; pname = "ripple-data-api";
version = lib.strings.substring 0 7 rev; version = lib.strings.substring 0 7 rev;
rev = "c56b860105f36c1c44ae011189d495272648c589"; rev = "c56b860105f36c1c44ae011189d495272648c589";

View file

@ -13,10 +13,10 @@ with lib;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
version = elk6Version; version = elk6Version;
name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
src = fetchurl { src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz";
sha256 = sha256 =
if enableUnfree if enableUnfree
then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42" then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42"

View file

@ -27,10 +27,10 @@ let
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
version = elk7Version; version = elk7Version;
name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}";
src = fetchurl { src = fetchurl {
url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz";
sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture");
}; };

View file

@ -22,10 +22,11 @@ let
in in
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "shishi-1.0.2"; pname = "shishi";
version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/shishi/${name}.tar.gz"; url = "mirror://gnu/shishi/shishi-${version}.tar.gz";
sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"; sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
}; };

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl }: { lib, stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "silc-server-1.1.18"; pname = "silc-server";
version = "1.1.18";
src = fetchurl { src = fetchurl {
url = "http://silcnet.org/download/server/sources/${name}.tar.bz2"; url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2";
sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s"; sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s";
}; };

View file

@ -1,10 +1,11 @@
{ fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }: { fetchurl, lib, stdenv, pkg-config, ucommon, libosip, libexosip, gnutls, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sipwitch-1.9.15"; pname = "sipwitch";
version = "1.9.15";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/sipwitch/${name}.tar.gz"; url = "mirror://gnu/sipwitch/sipwitch-${version}.tar.gz";
sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482"; sha256 = "2a7aa86a653f6810b3cd9cce6c37b3f70e937e7d14b09fd5c2a70d70588a9482";
}; };

View file

@ -1,11 +1,12 @@
{lib, stdenv, fetchurl, ant, unzip}: {lib, stdenv, fetchurl, ant, unzip}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mysql-connector-java-5.1.46"; pname = "mysql-connector-java";
version = "5.1.46";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; url = "http://dev.mysql.com/get/Downloads/Connector-J/${pname}-${version}.zip";
sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm"; sha256 = "0dfjshrrx0ndfb6xbdpwhn1f1jkw0km57rgpar0ny8ixmgdnlwnm";
}; };

View file

@ -2,7 +2,8 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pg_similarity-1.0"; pname = "pg_similarity";
version = "1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eulerto"; owner = "eulerto";
repo = "pg_similarity"; repo = "pg_similarity";

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: { lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "virtuoso-opensource-6.1.6"; pname = "virtuoso-opensource";
version = "6.1.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz";
sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6";
}; };
@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
echo Moving documentation echo Moving documentation
mkdir -pv $out/share/doc mkdir -pv $out/share/doc
mv -v $out/share/virtuoso/doc $out/share/doc/${name} mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version}
echo Removing jars and empty directories echo Removing jars and empty directories
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete

View file

@ -1,10 +1,11 @@
{ lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }: { lib, stdenv, fetchurl, libxml2, openssl, readline, gawk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "virtuoso-opensource-7.2.4.2"; pname = "virtuoso-opensource";
version = "7.2.4.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; url = "mirror://sourceforge/virtuoso/${pname}-${version}.tar.gz";
sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002"; sha256 = "12dqam1gc1v93l0bj0vlpvjqppki6y1hqrlznywxnw0rrz9pb002";
}; };
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
postInstall='' postInstall=''
echo Moving documentation echo Moving documentation
mkdir -pv $out/share/doc mkdir -pv $out/share/doc
mv -v $out/share/virtuoso/doc $out/share/doc/${name} mv -v $out/share/virtuoso/doc $out/share/doc/${pname}-${version}
echo Removing jars and empty directories echo Removing jars and empty directories
find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
''; '';

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.2"; version = "1.0.2";
name = "${varnish.name}-digest-${version}"; pname = "${varnish.name}-digest";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "varnish"; owner = "varnish";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.4"; version = "0.4";
name = "${varnish.name}-dynamic-${version}"; pname = "${varnish.name}-dynamic";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nigoroll"; owner = "nigoroll";

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.15.0"; version = "0.15.0";
name = "${varnish.name}-modules-${version}"; pname = "${varnish.name}-modules";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "varnish"; owner = "varnish";

View file

@ -14,12 +14,12 @@ let
}); });
in package.override rec { in package.override rec {
name = "bookstack"; pname = "bookstack";
version = "21.05.3"; version = "21.05.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bookstackapp"; owner = "bookstackapp";
repo = name; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8"; sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8";
}; };

View file

@ -29,7 +29,7 @@ let
in in
mkYarnPackage rec { mkYarnPackage rec {
name = "hedgedoc"; pname = "hedgedoc";
version = "1.8.2"; version = "1.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -13,7 +13,6 @@
let let
pname = "plausible"; pname = "plausible";
version = "1.3.0"; version = "1.3.0";
name = "${pname}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "plausible"; owner = "plausible";

View file

@ -95,7 +95,8 @@ let
]; ];
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "xquartz-${lib.getVersion xorg.xorgserver}"; pname = "xquartz";
version = lib.getVersion xorg.xorgserver;
nativeBuildInputs = [ ruby makeWrapper ]; nativeBuildInputs = [ ruby makeWrapper ];

View file

@ -1,10 +1,11 @@
{ fetchurl, fetchpatch, lib, stdenv, libtirpc }: { fetchurl, fetchpatch, lib, stdenv, libtirpc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xinetd-2.3.15"; pname = "xinetd";
version = "2.3.15";
src = fetchurl { src = fetchurl {
url = "http://www.xinetd.org/${name}.tar.gz"; url = "http://www.xinetd.org/xinetd-${version}.tar.gz";
sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz";
}; };