commit a56d117bdbff1384ca317dd0eb3d4f6ebc298cd0 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

servers: replace name with pname&version

Felix Buehler 4 years ago a56d117b e1533b22

+114 -105

53 changed files

expand all

unified split

pkgs

servers

adguardhome

default.nix

apcupsd

default.nix

computing

slurm-spank-x11

default.nix

domoticz

default.nix

fingerd

bsd-fingerd

default.nix

ftp

bftpd

default.nix

pure-ftpd

default.nix

vsftpd

default.nix

gotify

ui.nix

gpm

default.nix

hashi-ui

default.nix

hasura

cli.nix

holochain-go

default.nix

http

apache-modules

mod_fastcgi

default.nix

jboss

jdbc

mysql

default.nix

micro-httpd

default.nix

redstore

default.nix

tomcat

jdbc

mysql

default.nix

icecast

default.nix

icingaweb2

theme-april

default.nix

theme-lsd

default.nix

theme-particles

default.nix

theme-snow

default.nix

theme-spring

default.nix

theme-unicorn

default.nix

irc

charybdis

default.nix

ircd-hybrid

default.nix

monitoring

grafana-image-renderer

default.nix

heapster

default.nix

prometheus

jmx-httpserver.nix

tor-exporter.nix

nas

default.nix

neard

default.nix

news

leafnode

default.nix

nextcloud

news-updater.nix

rippled

data-api.nix

elasticsearch

6.x.nix

7.x.nix

shishi

default.nix

silc-server

default.nix

sip

sipwitch

default.nix

sql

mysql

jdbc

default.nix

postgresql

ext

pg_similarity.nix

virtuoso

6.x.nix

7.x.nix

varnish

digest.nix

dynamic.nix

modules.nix

web-apps

bookstack

default.nix

hedgedoc

default.nix

plausible

default.nix

x11

xquartz

default.nix

xinetd

default.nix

+1 -1

pkgs/servers/adguardhome/default.nix

··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "adguardhome"; 4 + pname = "adguardhome"; 5 5 version = "0.106.3"; 6 6 7 7 src = fetchurl {

+2 -2

pkgs/servers/apcupsd/default.nix

··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "apcupsd"; 9 - name = "${pname}-3.14.14"; 9 + version = "3.14.14"; 10 10 11 11 src = fetchurl { 12 - url = "mirror://sourceforge/${pname}/${name}.tar.gz"; 12 + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; 13 13 sha256 = "0rwqiyzlg9p0szf3x6q1ppvrw6f6dbpn2rc5z623fk3bkdalhxyv"; 14 14 }; 15 15

+2 -5

pkgs/servers/computing/slurm-spank-x11/default.nix

··· 1 1 { lib, stdenv, fetchFromGitHub, slurm } : 2 - let 2 + stdenv.mkDerivation rec { 3 + pname = "slurm-spank-x11"; 3 4 version = "0.2.5"; 4 - in 5 - stdenv.mkDerivation { 6 - name = "slurm-spank-x11-${version}"; 7 - version = version; 8 5 9 6 src = fetchFromGitHub { 10 7 owner = "hautreux";

+1 -1

pkgs/servers/domoticz/default.nix

··· 32 32 }; 33 33 in 34 34 stdenv.mkDerivation rec { 35 - name = "domoticz"; 35 + pname = "domoticz"; 36 36 inherit version; 37 37 38 38 src = domoticz-src;

+4 -3

pkgs/servers/fingerd/bsd-fingerd/default.nix

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

+2 -5

pkgs/servers/ftp/bftpd/default.nix

··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 - let 3 + stdenv.mkDerivation rec { 4 4 pname = "bftpd"; 5 - 6 - in stdenv.mkDerivation rec { 7 - name = "${pname}-${version}"; 8 5 version = "5.9"; 9 6 10 7 src = fetchurl { 11 - url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz"; 8 + url = "mirror://sourceforge/project/${pname}/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; 12 9 sha256 = "sha256-LMcjPdePlKqVD3kdlPxF4LlVp9BLJFkgTg+WWaWPrqY="; 13 10 }; 14 11

+3 -2

pkgs/servers/ftp/pure-ftpd/default.nix

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

+3 -2

pkgs/servers/ftp/vsftpd/default.nix

··· 1 1 { lib, stdenv, fetchurl, libcap, openssl, pam }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "vsftpd-3.0.3"; 4 + pname = "vsftpd"; 5 + version = "3.0.3"; 5 6 6 7 src = fetchurl { 7 - url = "https://security.appspot.com/downloads/${name}.tar.gz"; 8 + url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz"; 8 9 sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx"; 9 10 }; 10 11

+1 -1

pkgs/servers/gotify/ui.nix

··· 3 3 }: 4 4 5 5 yarn2nix-moretea.mkYarnPackage rec { 6 - name = "gotify-ui"; 6 + pname = "gotify-ui"; 7 7 8 8 packageJSON = ./package.json; 9 9 yarnNix = ./yarndeps.nix;

+3 -2

pkgs/servers/gpm/default.nix

··· 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { 8 - name = "gpm-1.20.7"; 8 + pname = "gpm"; 9 + version = "1.20.7"; 9 10 10 11 src = fetchurl { 11 - url = "https://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2"; 12 + url = "https://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.bz2"; 12 13 sha256 = "13d426a8h403ckpc8zyf7s2p5rql0lqbg2bv0454x0pvgbfbf4gh"; 13 14 }; 14 15

+1 -1

pkgs/servers/hashi-ui/default.nix

··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "hashi-ui"; 4 + pname = "hashi-ui"; 5 5 version = "1.3.8"; 6 6 7 7 src = fetchurl {

+1 -1

pkgs/servers/hasura/cli.nix

··· 1 1 { buildGoModule, hasura-graphql-engine }: 2 2 3 3 buildGoModule rec { 4 - name = "hasura-${version}"; 4 + pname = "hasura"; 5 5 version = hasura-graphql-engine.version; 6 6 7 7 src = hasura-graphql-engine.src;

+1 -1

pkgs/servers/holochain-go/default.nix

··· 1 1 { lib, buildGoPackage, fetchFromGitHub }: 2 2 3 3 buildGoPackage rec { 4 - name = "holochain-go${version}"; 4 + pname = "holochain-go"; 5 5 version = "0.1.0-alpha"; 6 6 rev = "a17510b910a7a377441c152b8dccdbae1999f63f"; 7 7

+6 -8

pkgs/servers/http/apache-modules/mod_fastcgi/default.nix

··· 1 1 { lib, stdenv, fetchurl, apacheHttpd }: 2 2 3 3 let 4 - version = "2.4.7.1"; 5 - 6 4 apache-24-patch = fetchurl { 7 - name = "compile-against-apache24.diff"; 8 - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; 9 - sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; 10 - }; 5 + name = "compile-against-apache24.diff"; 6 + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/compile-against-apache24.diff?h=packages/mod_fastcgi&id=81c7cb99d15682df3bdb1edcaeea5259e9e43a42"; 7 + sha256 = "000qvrf5jb979i37rimrdivcgjijcffgrpkx38c0rn62z9jz61g4"; 8 + }; 11 9 in 12 - stdenv.mkDerivation { 10 + stdenv.mkDerivation rec { 13 11 pname = "mod_fastcgi"; 14 - inherit version; 12 + version = "2.4.7.1"; 15 13 16 14 src = fetchurl { 17 15 url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz";

+2 -1

pkgs/servers/http/jboss/jdbc/mysql/default.nix

··· 1 1 { lib, stdenv, mysql_jdbc }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "jboss-mysql-jdbc"; 4 + pname = "jboss-mysql-jdbc"; 5 5 6 6 builder = ./builder.sh; 7 7 8 8 inherit mysql_jdbc; 9 + version = mysql_jdbc.version; 9 10 10 11 meta = { 11 12 platforms = lib.platforms.unix;

+2 -1

pkgs/servers/http/micro-httpd/default.nix

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

+3 -2

pkgs/servers/http/redstore/default.nix

··· 2 2 , librdf_rasqal }: 3 3 4 4 stdenv.mkDerivation rec { 5 - name = "redstore-0.5.4"; 5 + pname = "redstore"; 6 + version = "0.5.4"; 6 7 7 8 src = fetchurl { 8 - url = "https://www.aelius.com/njh/redstore/${name}.tar.gz"; 9 + url = "https://www.aelius.com/njh/redstore/redstore-${version}.tar.gz"; 9 10 sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq"; 10 11 }; 11 12

+2 -1

pkgs/servers/http/tomcat/jdbc/mysql/default.nix

··· 1 1 { lib, stdenv, mysql_jdbc }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "tomcat-mysql-jdbc"; 4 + pname = "tomcat-mysql-jdbc"; 5 5 builder = ./builder.sh; 6 6 buildInputs = [ mysql_jdbc ]; 7 7 8 8 inherit mysql_jdbc; 9 + version = mysql_jdbc.version; 9 10 10 11 meta = { 11 12 platforms = lib.platforms.unix;

+3 -2

pkgs/servers/icecast/default.nix

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

+2 -2

pkgs/servers/icingaweb2/theme-april/default.nix

··· 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "icingaweb2-theme-april"; 7 + pname = "icingaweb2-theme-april"; 8 8 version = "1.0.4"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "Mikesch-mp"; 12 - repo = name; 12 + repo = pname; 13 13 rev = "v${version}"; 14 14 sha256 = "0i1js2k47llzgmc77q9frvcmr02mqlhg0qhswx1486fvm6myxg0g"; 15 15 };

+2 -2

pkgs/servers/icingaweb2/theme-lsd/default.nix

··· 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "icingaweb2-theme-lsd"; 7 + pname = "icingaweb2-theme-lsd"; 8 8 version = "1.0.3"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "Mikesch-mp"; 12 - repo = name; 12 + repo = pname; 13 13 rev = "v${version}"; 14 14 sha256 = "172y08sar4nbyv5pfq5chw8xa3b7fg1dacmsg778zky5zf49qz2w"; 15 15 };

+2 -2

pkgs/servers/icingaweb2/theme-particles/default.nix

··· 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "icingaweb2-theme-particles"; 7 + pname = "icingaweb2-theme-particles"; 8 8 version = "1.0.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "Mikesch-mp"; 12 - repo = name; 12 + repo = pname; 13 13 rev = "v${version}"; 14 14 sha256 = "0m6bbz191686k4djqbk8v0zcdm4cyi159jb3zwz7q295xbpi2vfy"; 15 15 };

+2 -2

pkgs/servers/icingaweb2/theme-snow/default.nix

··· 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "icingaweb2-theme-snow"; 7 + pname = "icingaweb2-theme-snow"; 8 8 version = "1.0.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "Mikesch-mp"; 12 - repo = name; 12 + repo = pname; 13 13 rev = "v${version}"; 14 14 sha256 = "1c974v85mbsis52y2knwzh33996q8sza7pqrcs6ydx033s0rxjrp"; 15 15 };

+2 -2

pkgs/servers/icingaweb2/theme-spring/default.nix

··· 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "icingaweb2-theme-spring"; 7 + pname = "icingaweb2-theme-spring"; 8 8 version = "1.0.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "Mikesch-mp"; 12 - repo = name; 12 + repo = pname; 13 13 rev = "v${version}"; 14 14 sha256 = "09v4871pndarhm2spxm9fdab58l5wj8m40kh53wvk1xc3g7pqki9"; 15 15 };

+2 -2

pkgs/servers/icingaweb2/theme-unicorn/default.nix

··· 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { 8 - name = "icingaweb2-theme-unicorn"; 8 + pname = "icingaweb2-theme-unicorn"; 9 9 version = "1.0.2"; 10 10 11 11 srcs = [ 12 12 (fetchFromGitHub { 13 13 owner = "Mikesch-mp"; 14 - repo = name; 14 + repo = pname; 15 15 rev = "v${version}"; 16 16 sha256 = "1qmcajdf0g70vp2avqa50lfrfigq22k91kggbgn5ablwyg9dki05"; 17 17 })

+3 -2

pkgs/servers/irc/charybdis/default.nix

··· 1 1 { lib, stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "charybdis-4.1.2"; 4 + pname = "charybdis"; 5 + version = "4.1.2"; 5 6 6 7 src = fetchFromGitHub { 7 8 owner = "charybdis-ircd"; 8 9 repo = "charybdis"; 9 - rev = name; 10 + rev = "${pname}-${version}"; 10 11 sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; 11 12 }; 12 13

+3 -2

pkgs/servers/irc/ircd-hybrid/default.nix

··· 1 1 { lib, stdenv, fetchurl, openssl, zlib }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "ircd-hybrid-8.2.36"; 4 + pname = "ircd-hybrid"; 5 + version = "8.2.36"; 5 6 6 7 src = fetchurl { 7 - url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; 8 + url = "mirror://sourceforge/ircd-hybrid/ircd-hybrid-${version}.tgz"; 8 9 sha256 = "0sg4g0znl8ic8vklpy96z88gjksc165kl945a6fr1j4xc1bf8gcv"; 9 10 }; 10 11

+1 -1

pkgs/servers/monitoring/grafana-image-renderer/default.nix

··· 9 9 # * Update `version`+`hash` and rebuild. 10 10 11 11 mkYarnPackage rec { 12 - name = "grafana-image-renderer"; 12 + pname = "grafana-image-renderer"; 13 13 version = "3.0.0"; 14 14 15 15 src = fetchFromGitHub {

+2 -1

pkgs/servers/monitoring/heapster/default.nix

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

+4 -7

pkgs/servers/monitoring/prometheus/jmx-httpserver.nix

··· 1 1 { lib, stdenv, fetchurl, jre, makeWrapper }: 2 2 3 - let 3 + stdenv.mkDerivation rec { 4 + pname = "jmx-prometheus-httpserver"; 4 5 version = "0.15.0"; 6 + 5 7 jarName = "jmx_prometheus_httpserver-${version}-jar-with-dependencies.jar"; 6 - mavenUrl = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; 7 - in stdenv.mkDerivation { 8 - inherit version jarName; 9 - 10 - name = "jmx-prometheus-httpserver-${version}"; 11 8 12 9 src = fetchurl { 13 - url = mavenUrl; 10 + url = "mirror://maven/io/prometheus/jmx/jmx_prometheus_httpserver/${version}/${jarName}"; 14 11 sha256 = "0fr3svn8kjp7bq1wzbkvv5awylwn8b01bngj04zvk7fpzqpgs7mz"; 15 12 }; 16 13

+1 -1

pkgs/servers/monitoring/prometheus/tor-exporter.nix

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

+1 -3

pkgs/servers/nas/default.nix

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

+3 -2

pkgs/servers/neard/default.nix

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

+2 -1

pkgs/servers/news/leafnode/default.nix

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

+1 -1

pkgs/servers/nextcloud/news-updater.nix

··· 1 1 { lib, fetchurl, python3Packages, php }: 2 2 3 3 python3Packages.buildPythonApplication rec { 4 - name = "nextcloud-news-updater-${version}"; 4 + pname = "nextcloud-news-updater"; 5 5 version = "10.0.1"; 6 6 7 7 src = fetchurl {

+1 -1

pkgs/servers/rippled/data-api.nix

··· 5 5 let 6 6 np = nodePackages.override { generated = ./package.nix; self = np; }; 7 7 in nodePackages.buildNodePackage rec { 8 - name = "ripple-data-api-${version}"; 8 + pname = "ripple-data-api"; 9 9 version = lib.strings.substring 0 7 rev; 10 10 rev = "c56b860105f36c1c44ae011189d495272648c589"; 11 11

+2 -2

pkgs/servers/search/elasticsearch/6.x.nix

··· 13 13 14 14 stdenv.mkDerivation (rec { 15 15 version = elk6Version; 16 - name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; 16 + pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}"; 17 17 18 18 src = fetchurl { 19 - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; 19 + url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz"; 20 20 sha256 = 21 21 if enableUnfree 22 22 then "09dy3iyzk460vra6na6vk7d3mzpbv4cl0pl7kjmybxy947j7hh42"

+2 -2

pkgs/servers/search/elasticsearch/7.x.nix

··· 27 27 in 28 28 stdenv.mkDerivation (rec { 29 29 version = elk7Version; 30 - name = "elasticsearch-${optionalString (!enableUnfree) "oss-"}${version}"; 30 + pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}"; 31 31 32 32 src = fetchurl { 33 - url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}-${plat}-${arch}.tar.gz"; 33 + url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}-${plat}-${arch}.tar.gz"; 34 34 sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); 35 35 }; 36 36

+3 -2

pkgs/servers/shishi/default.nix

··· 22 22 in 23 23 with lib; 24 24 stdenv.mkDerivation rec { 25 - name = "shishi-1.0.2"; 25 + pname = "shishi"; 26 + version = "1.0.2"; 26 27 27 28 src = fetchurl { 28 - url = "mirror://gnu/shishi/${name}.tar.gz"; 29 + url = "mirror://gnu/shishi/shishi-${version}.tar.gz"; 29 30 sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d"; 30 31 }; 31 32

+3 -2

pkgs/servers/silc-server/default.nix

··· 1 1 { lib, stdenv, fetchurl }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "silc-server-1.1.18"; 4 + pname = "silc-server"; 5 + version = "1.1.18"; 5 6 6 7 src = fetchurl { 7 - url = "http://silcnet.org/download/server/sources/${name}.tar.bz2"; 8 + url = "http://silcnet.org/download/server/sources/silc-server-${version}.tar.bz2"; 8 9 sha256 = "0nr0hrwr4kbi611qazmrify7a27nzxb5n7d97f5i9cw3avxlw38s"; 9 10 }; 10 11

+3 -2

pkgs/servers/sip/sipwitch/default.nix

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

+3 -2

pkgs/servers/sql/mysql/jdbc/default.nix

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

+2 -1

pkgs/servers/sql/postgresql/ext/pg_similarity.nix

··· 2 2 3 3 stdenv.mkDerivation { 4 4 5 - name = "pg_similarity-1.0"; 5 + pname = "pg_similarity"; 6 + version = "1.0"; 6 7 src = fetchFromGitHub { 7 8 owner = "eulerto"; 8 9 repo = "pg_similarity";

+4 -3

pkgs/servers/sql/virtuoso/6.x.nix

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

+4 -3

pkgs/servers/sql/virtuoso/7.x.nix

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

+1 -1

pkgs/servers/varnish/digest.nix

··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "1.0.2"; 5 - name = "${varnish.name}-digest-${version}"; 5 + pname = "${varnish.name}-digest"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "varnish";

+1 -1

pkgs/servers/varnish/dynamic.nix

··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "0.4"; 5 - name = "${varnish.name}-dynamic-${version}"; 5 + pname = "${varnish.name}-dynamic"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "nigoroll";

+1 -1

pkgs/servers/varnish/modules.nix

··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "0.15.0"; 5 - name = "${varnish.name}-modules-${version}"; 5 + pname = "${varnish.name}-modules"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "varnish";

+2 -2

pkgs/servers/web-apps/bookstack/default.nix

··· 14 14 }); 15 15 16 16 in package.override rec { 17 - name = "bookstack"; 17 + pname = "bookstack"; 18 18 version = "21.05.3"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "bookstackapp"; 22 - repo = name; 22 + repo = pname; 23 23 rev = "v${version}"; 24 24 sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8"; 25 25 };

+1 -1

pkgs/servers/web-apps/hedgedoc/default.nix

··· 29 29 in 30 30 31 31 mkYarnPackage rec { 32 - name = "hedgedoc"; 32 + pname = "hedgedoc"; 33 33 version = "1.8.2"; 34 34 35 35 src = fetchFromGitHub {

-1

pkgs/servers/web-apps/plausible/default.nix

··· 13 13 let 14 14 pname = "plausible"; 15 15 version = "1.3.0"; 16 - name = "${pname}-${version}"; 17 16 18 17 src = fetchFromGitHub { 19 18 owner = "plausible";

+2 -1

pkgs/servers/x11/xquartz/default.nix

··· 95 95 ]; 96 96 }; 97 97 in stdenv.mkDerivation { 98 - name = "xquartz-${lib.getVersion xorg.xorgserver}"; 98 + pname = "xquartz"; 99 + version = lib.getVersion xorg.xorgserver; 99 100 100 101 nativeBuildInputs = [ ruby makeWrapper ]; 101 102

+3 -2

pkgs/servers/xinetd/default.nix

··· 1 1 { fetchurl, fetchpatch, lib, stdenv, libtirpc }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "xinetd-2.3.15"; 4 + pname = "xinetd"; 5 + version = "2.3.15"; 5 6 6 7 src = fetchurl { 7 - url = "http://www.xinetd.org/${name}.tar.gz"; 8 + url = "http://www.xinetd.org/xinetd-${version}.tar.gz"; 8 9 sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; 9 10 }; 10 11