alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #68339 from NixOS/staging-next

Browse source 
Staging next with systemd 243
This commit is contained in:
Frederik Rietdijk 2019-09-09 10:02:20 +02:00 committed by GitHub
parent 98c17a68e7 5f95fdbb7d
commit 0107ee8c32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
393 changed files with 527 additions and 509 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/config/fonts/fontconfig.nix
View file

@ -51,8 +51,8 @@ let
then "fontconfig" then "fontconfig"
else "fontconfig_${version}"; else "fontconfig_${version}";
makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; }; makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
cache = makeCache pkgs."${fcPackage}"; cache = makeCache pkgs.${fcPackage};
cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}"; cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
in in
pkgs.writeText "fc-00-nixos-cache.conf" '' pkgs.writeText "fc-00-nixos-cache.conf" ''
<?xml version='1.0'?> <?xml version='1.0'?>

6
nixos/modules/hardware/printers.nix
View file

@ -94,8 +94,8 @@ in {
ppdOptions = mkOption { ppdOptions = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
example = { example = {
"PageSize" = "A4"; PageSize = "A4";
"Duplex" = "DuplexNoTumble"; Duplex = "DuplexNoTumble";
}; };
default = {}; default = {};
description = '' description = ''
@ -110,7 +110,7 @@ in {
}; };
config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) { config = mkIf (cfg.ensurePrinters != [] && config.services.printing.enable) {
systemd.services."ensure-printers" = let systemd.services.ensure-printers = let
cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service"; cupsUnit = if config.services.printing.startWhenNeeded then "cups.socket" else "cups.service";
in { in {
description = "Ensure NixOS-configured CUPS printers"; description = "Ensure NixOS-configured CUPS printers";

2
nixos/modules/programs/x2goserver.nix
View file

@ -6,7 +6,7 @@ let
cfg = config.programs.x2goserver; cfg = config.programs.x2goserver;
defaults = { defaults = {
superenicer = { "enable" = cfg.superenicer.enable; }; superenicer = { enable = cfg.superenicer.enable; };
}; };
confText = generators.toINI {} (recursiveUpdate defaults cfg.settings); confText = generators.toINI {} (recursiveUpdate defaults cfg.settings);
x2goServerConf = pkgs.writeText "x2goserver.conf" confText; x2goServerConf = pkgs.writeText "x2goserver.conf" confText;

4
nixos/modules/services/audio/roon-server.nix
View file

@ -61,8 +61,8 @@ in {
}; };
users.groups."${cfg.group}" = {}; users.groups.${cfg.group} = {};
users.users."${cfg.user}" = users.users.${cfg.user} =
if cfg.user == "roon-server" then { if cfg.user == "roon-server" then {
isSystemUser = true; isSystemUser = true;
description = "Roon Server user"; description = "Roon Server user";

4
nixos/modules/services/cluster/kubernetes/flannel.nix
View file

@ -47,7 +47,7 @@ in
}]; }];
}; };
systemd.services."mk-docker-opts" = { systemd.services.mk-docker-opts = {
description = "Pre-Docker Actions"; description = "Pre-Docker Actions";
path = with pkgs; [ gawk gnugrep ]; path = with pkgs; [ gawk gnugrep ];
script = '' script = ''
@ -57,7 +57,7 @@ in
serviceConfig.Type = "oneshot"; serviceConfig.Type = "oneshot";
}; };
systemd.paths."flannel-subnet-env" = { systemd.paths.flannel-subnet-env = {
wantedBy = [ "flannel.service" ]; wantedBy = [ "flannel.service" ];
pathConfig = { pathConfig = {
PathModified = "/run/flannel/subnet.env"; PathModified = "/run/flannel/subnet.env";

2
nixos/modules/services/network-filesystems/ceph.nix
View file

@ -390,7 +390,7 @@ in
systemd.targets = let systemd.targets = let
targets = [ targets = [
{ "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; { ceph = { description = "Ceph target allowing to start/stop all ceph service instances at once";
wantedBy = [ "multi-user.target" ]; }; } wantedBy = [ "multi-user.target" ]; }; }
] ++ optional cfg.mon.enable (makeTarget "mon") ] ++ optional cfg.mon.enable (makeTarget "mon")
++ optional cfg.mds.enable (makeTarget "mds") ++ optional cfg.mds.enable (makeTarget "mds")

2
nixos/modules/services/networking/pdns-recursor.nix
View file

@ -168,7 +168,7 @@ in {
disable-syslog = true; disable-syslog = true;
}; };
users.users."${username}" = { users.users.${username} = {
home = dataDir; home = dataDir;
createHome = true; createHome = true;
uid = config.ids.uids.pdns-recursor; uid = config.ids.uids.pdns-recursor;

2
nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix
View file

@ -165,7 +165,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = { ${poolName} = {
user = "icingaweb2"; user = "icingaweb2";
phpOptions = '' phpOptions = ''
extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so

8
nixos/modules/services/web-apps/moodle.nix
View file

@ -18,7 +18,7 @@ let
global $CFG; global $CFG;
$CFG = new stdClass(); $CFG = new stdClass();
$CFG->dbtype = '${ { "mysql" = "mariadb"; "pgsql" = "pgsql"; }.${cfg.database.type} }'; $CFG->dbtype = '${ { mysql = "mariadb"; pgsql = "pgsql"; }.${cfg.database.type} }';
$CFG->dblibrary = 'native'; $CFG->dblibrary = 'native';
$CFG->dbhost = '${cfg.database.host}'; $CFG->dbhost = '${cfg.database.host}';
$CFG->dbname = '${cfg.database.name}'; $CFG->dbname = '${cfg.database.name}';
@ -92,8 +92,8 @@ in
type = types.int; type = types.int;
description = "Database host port."; description = "Database host port.";
default = { default = {
"mysql" = 3306; mysql = 3306;
"pgsql" = 5432; pgsql = 5432;
}.${cfg.database.type}; }.${cfg.database.type};
defaultText = "3306"; defaultText = "3306";
}; };
@ -294,7 +294,7 @@ in
systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
users.users."${user}".group = group; users.users.${user}.group = group;
}; };
} }

2
nixos/modules/services/web-apps/restya-board.nix
View file

@ -179,7 +179,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.phpfpm.pools = { services.phpfpm.pools = {
"${poolName}" = { ${poolName} = {
inherit (cfg) user group; inherit (cfg) user group;
phpOptions = '' phpOptions = ''

2
nixos/modules/services/web-apps/selfoss.nix
View file

@ -115,7 +115,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = { ${poolName} = {
user = "nginx"; user = "nginx";
settings = mapAttrs (name: mkDefault) { settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx"; "listen.owner" = "nginx";

2
nixos/modules/services/web-apps/tt-rss.nix
View file

@ -520,7 +520,7 @@ let
]; ];
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
"${poolName}" = { ${poolName} = {
inherit (cfg) user; inherit (cfg) user;
settings = mapAttrs (name: mkDefault) { settings = mapAttrs (name: mkDefault) {
"listen.owner" = "nginx"; "listen.owner" = "nginx";

2
nixos/modules/services/web-servers/phpfpm/default.nix
View file

@ -36,7 +36,7 @@ let
poolOpts = { name, ... }: poolOpts = { name, ... }:
let let
poolOpts = cfg.pools."${name}"; poolOpts = cfg.pools.${name};
in in
{ {
options = { options = {

4
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -243,11 +243,11 @@ in
services.geoclue2.enable = mkDefault true; services.geoclue2.enable = mkDefault true;
services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
services.geoclue2.appConfig."gnome-datetime-panel" = { services.geoclue2.appConfig.gnome-datetime-panel = {
isAllowed = true; isAllowed = true;
isSystem = true; isSystem = true;
}; };
services.geoclue2.appConfig."gnome-color-panel" = { services.geoclue2.appConfig.gnome-color-panel = {
isAllowed = true; isAllowed = true;
isSystem = true; isSystem = true;
}; };

10
nixos/modules/tasks/network-interfaces-systemd.nix
View file

@ -72,7 +72,15 @@ in
}; };
in mkMerge [ { in mkMerge [ {
enable = true; enable = true;
networks."99-main" = genericNetwork mkDefault; networks."99-main" = (genericNetwork mkDefault) // {
# We keep the "broken" behaviour of applying this to all interfaces.
# In general we want to get rid of this workaround but there hasn't
# been any work on that.
# See the following issues for details:
# - https://github.com/NixOS/nixpkgs/issues/18962
# - https://github.com/NixOS/nixpkgs/issues/61629
matchConfig = mkDefault { Name = "*"; };
};
} }
(mkMerge (forEach interfaces (i: { (mkMerge (forEach interfaces (i: {
netdevs = mkIf i.virtual ({ netdevs = mkIf i.virtual ({

1
nixos/tests/login.nix
View file

@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
machine = machine =
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest; { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
}; };
testScript = testScript =

2
pkgs/applications/audio/AMB-plugins/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
longDescription = '' longDescription = ''
Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders.
''; '';
version = "${version}"; version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.magnetophon ]; maintainers = [ stdenv.lib.maintainers.magnetophon ];

2
pkgs/applications/audio/FIL-plugins/default.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises. All switches and controls are internally smoothed, so they can be used 'live' whithout any clicks or zipper noises.
This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use.
''; '';
version = "${version}"; version = version;
homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.magnetophon ]; maintainers = [ stdenv.lib.maintainers.magnetophon ];

2
pkgs/applications/audio/axoloti/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "axoloti"; owner = "axoloti";
repo = "axoloti"; repo = "axoloti";
rev = "${version}"; rev = version;
sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9"; sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9";
}; };

2
pkgs/applications/audio/csound/csound-qt/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CsoundQt"; owner = "CsoundQt";
repo = "CsoundQt"; repo = "CsoundQt";
rev = "${version}"; rev = version;
sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip"; sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
}; };

2
pkgs/applications/audio/faust/faust2.nix
View file

@ -20,7 +20,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "grame-cncm"; owner = "grame-cncm";
repo = "faust"; repo = "faust";
rev = "${version}"; rev = version;
sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc"; sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
fetchSubmodules = true; fetchSubmodules = true;
}; };

2
pkgs/applications/audio/ir.lv2/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tomszilagyi"; owner = "tomszilagyi";
repo = "ir.lv2"; repo = "ir.lv2";
rev = "${version}"; rev = version;
sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6"; sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";
}; };

2
pkgs/applications/audio/lsp-plugins/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sadko4u"; owner = "sadko4u";
repo = "${pname}"; repo = pname;
rev = "${pname}-${version}"; rev = "${pname}-${version}";
sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2"; sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2";
}; };

2
pkgs/applications/audio/musescore/darwin.nix
View file

@ -9,7 +9,7 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "musescore-darwin"; pname = "musescore-darwin";
version = "${concatStringsSep "." versionComponents}"; version = concatStringsSep "." versionComponents;
src = fetchurl { src = fetchurl {
url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";

2
pkgs/applications/audio/sooperlooper/default.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
and the engine can be run standalone on a computer without a monitor. and the engine can be run standalone on a computer without a monitor.
''; '';
version = "${version}"; version = version;
homepage = http://essej.net/sooperlooper/index.html; homepage = http://essej.net/sooperlooper/index.html;
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ]; maintainers = [ stdenv.lib.maintainers.magnetophon ];

2
pkgs/applications/audio/spotifyd/default.nix
View file

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Spotifyd"; owner = "Spotifyd";
repo = "spotifyd"; repo = "spotifyd";
rev = "${version}"; rev = version;
sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
}; };

2
pkgs/applications/audio/ssrc/default.nix
View file

@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
without audible degradation. without audible degradation.
''; '';
version = "${version}"; version = version;
homepage = http://shibatch.sourceforge.net/; homepage = http://shibatch.sourceforge.net/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ leenaars]; maintainers = with maintainers; [ leenaars];

2
pkgs/applications/audio/tambura/default.nix
View file

@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "olilarkin"; owner = "olilarkin";
repo = "${pname}"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y"; sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y";
}; };

2
pkgs/applications/audio/whipper/default.nix
View file

@ -30,7 +30,7 @@ python2.pkgs.buildPythonApplication rec {
]; ];
makeWrapperArgs = [ makeWrapperArgs = [
"--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]}" "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
]; ];
# some tests require internet access # some tests require internet access

2
pkgs/applications/blockchains/nano-wallet/default.nix
View file

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cmakeFlags = let cmakeFlags = let
options = { options = {
BOOST_ROOT = "${boost}"; BOOST_ROOT = boost;
Boost_USE_STATIC_LIBS = "OFF"; Boost_USE_STATIC_LIBS = "OFF";
RAIBLOCKS_GUI = "ON"; RAIBLOCKS_GUI = "ON";
RAIBLOCKS_TEST = "ON"; RAIBLOCKS_TEST = "ON";

2
pkgs/applications/editors/emacs-modes/emacs2nix.nix
View file

@ -14,7 +14,7 @@ in pkgs.mkShell {
pkgs.bash pkgs.bash
]; ];
EMACS2NIX = "${src}"; EMACS2NIX = src;
shellHook = '' shellHook = ''
export PATH=$PATH:${src} export PATH=$PATH:${src}

2
pkgs/applications/editors/emacs-modes/manual-packages.nix
View file

@ -6,7 +6,7 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "skeeto"; owner = "skeeto";
repo = "elisp-ffi"; repo = "elisp-ffi";
rev = "${version}"; rev = version;
sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
}; };
buildInputs = [ external.libffi ]; buildInputs = [ external.libffi ];

2
pkgs/applications/editors/geany/with-vte.nix
View file

@ -1,7 +1,7 @@
{ runCommand, makeWrapper, geany, gnome2 }: { runCommand, makeWrapper, geany, gnome2 }:
let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
in in
runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } " runCommand name { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } "
mkdir -p $out mkdir -p $out
ln -s ${geany}/share $out ln -s ${geany}/share $out
makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib

2
pkgs/applications/editors/jupyter/kernel.nix
View file

@ -8,7 +8,7 @@ let
in { in {
displayName = "Python 3"; displayName = "Python 3";
argv = [ argv = [
"${env.interpreter}" env.interpreter
"-m" "-m"
"ipykernel_launcher" "ipykernel_launcher"
"-f" "-f"

2
pkgs/applications/editors/retext/default.nix
View file

@ -35,7 +35,7 @@ in python.pkgs.buildPythonApplication {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "retext-project"; owner = "retext-project";
repo = "retext"; repo = "retext";
rev = "${version}"; rev = version;
sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si"; sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si";
}; };

4
pkgs/applications/editors/vscode/vscode.nix
View file

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = { sha256 = {
"x86_64-linux" = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
"x86_64-darwin" = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
}.${system}; }.${system};
in in
callPackage ./generic.nix rec { callPackage ./generic.nix rec {

4
pkgs/applications/editors/vscode/vscodium.nix
View file

@ -11,8 +11,8 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = { sha256 = {
"x86_64-linux" = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
"x86_64-darwin" = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
}.${system}; }.${system};
in in
callPackage ./generic.nix rec { callPackage ./generic.nix rec {

2
pkgs/applications/graphics/ipe/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}/src"; sourceRoot = "${name}/src";
IPEPREFIX="${placeholder "out"}"; IPEPREFIX=placeholder "out";
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
LUA_PACKAGE = "lua"; LUA_PACKAGE = "lua";

2
pkgs/applications/graphics/runwayml/default.nix
View file

@ -16,7 +16,7 @@ let
}; };
binary = appimageTools.wrapType2 { binary = appimageTools.wrapType2 {
name = "${pname}"; name = pname;
inherit src; inherit src;
}; };
# we only use this to extract the icon # we only use this to extract the icon

2
pkgs/applications/misc/digitalbitbox/default.nix
View file

@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
LUPDATE="${qttools.dev}/bin/lupdate"; LUPDATE="${qttools.dev}/bin/lupdate";
LRELEASE="${qttools.dev}/bin/lrelease"; LRELEASE="${qttools.dev}/bin/lrelease";
MOC="${qtbase.dev}/bin/moc"; MOC="${qtbase.dev}/bin/moc";
QTDIR="${qtbase.dev}"; QTDIR=qtbase.dev;
RCC="${qtbase.dev}/bin/rcc"; RCC="${qtbase.dev}/bin/rcc";
UIC="${qtbase.dev}/bin/uic"; UIC="${qtbase.dev}/bin/uic";

2
pkgs/applications/misc/et/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "geistesk"; owner = "geistesk";
repo = "et"; repo = "et";
rev = "${version}"; rev = version;
sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc"; sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
}; };

2
pkgs/applications/misc/gosmore/default.nix
View file

@ -11,7 +11,7 @@ stdenv.mkDerivation {
src = fetchsvn { src = fetchsvn {
url = http://svn.openstreetmap.org/applications/rendering/gosmore; url = http://svn.openstreetmap.org/applications/rendering/gosmore;
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
rev = "${version}"; rev = version;
ignoreExternals = true; ignoreExternals = true;
}; };

2
pkgs/applications/misc/gummi/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "alexandervdm"; owner = "alexandervdm";
repo = "gummi"; repo = "gummi";
rev = "${version}"; rev = version;
sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
}; };

2
pkgs/applications/misc/keepassx/community.nix
View file

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "keepassxreboot"; owner = "keepassxreboot";
repo = "keepassxc"; repo = "keepassxc";
rev = "${version}"; rev = version;
sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac"; sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac";
}; };

2
pkgs/applications/misc/memo/default.nix
View file

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mrVanDalo"; owner = "mrVanDalo";
repo = "memo"; repo = "memo";
rev = "${version}"; rev = version;
sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp"; sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
}; };

2
pkgs/applications/misc/prusa-slicer/default.nix
View file

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
# xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source -
# for finding the nlopt library, which doesn't pick up the package in the nix store. # for finding the nlopt library, which doesn't pick up the package in the nix store.
# We need to set the path via the NLOPT environment variable instead. # We need to set the path via the NLOPT environment variable instead.
NLOPT = "${nlopt}"; NLOPT = nlopt;
prePatch = '' prePatch = ''
# In nix ioctls.h isn't available from the standard kernel-headers package # In nix ioctls.h isn't available from the standard kernel-headers package

2
pkgs/applications/misc/qdirstat/default.nix
View file

@ -11,7 +11,7 @@ in mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "shundhammer"; owner = "shundhammer";
repo = "qdirstat"; repo = "qdirstat";
rev = "${version}"; rev = version;
sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan"; sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan";
}; };

2
pkgs/applications/misc/qsyncthingtray/default.nix
View file

@ -12,7 +12,7 @@ mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sieren"; owner = "sieren";
repo = "QSyncthingTray"; repo = "QSyncthingTray";
rev = "${version}"; rev = version;
sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
}; };

4
pkgs/applications/misc/rxvt_unicode/default.nix
View file

@ -8,12 +8,12 @@ let
description = "A clone of the well-known terminal emulator rxvt"; description = "A clone of the well-known terminal emulator rxvt";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "${pname}"; name = pname;
exec = "urxvt"; exec = "urxvt";
icon = "utilities-terminal"; icon = "utilities-terminal";
comment = description; comment = description;
desktopName = "URxvt"; desktopName = "URxvt";
genericName = "${pname}"; genericName = pname;
categories = "System;TerminalEmulator;"; categories = "System;TerminalEmulator;";
}; };
in in

2
pkgs/applications/misc/spacefm/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IgnorantGuru"; owner = "IgnorantGuru";
repo = "spacefm"; repo = "spacefm";
rev = "${version}"; rev = version;
sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx"; sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
}; };

2
pkgs/applications/misc/terminal-parrot/default.nix
View file

@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jmhobbs"; owner = "jmhobbs";
repo = "terminal-parrot"; repo = "terminal-parrot";
rev = "${version}"; rev = version;
sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722";
}; };

2
pkgs/applications/misc/todolist/default.nix
View file

@ -9,7 +9,7 @@ buildGoPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gammons"; owner = "gammons";
repo = "todolist"; repo = "todolist";
rev = "${version}"; rev = version;
sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p"; sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
}; };

2
pkgs/applications/misc/toot/default.nix
View file

@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ihabunek"; owner = "ihabunek";
repo = "toot"; repo = "toot";
rev = "${version}"; rev = version;
sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5"; sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5";
}; };

2
pkgs/applications/misc/xiphos/default.nix
View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crosswire"; owner = "crosswire";
repo = "xiphos"; repo = "xiphos";
rev = "${version}"; rev = version;
sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
}; };

2
pkgs/applications/misc/xmr-stak/default.nix
View file

@ -17,7 +17,7 @@ stdenv'.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fireice-uk"; owner = "fireice-uk";
repo = "xmr-stak"; repo = "xmr-stak";
rev = "${version}"; rev = version;
sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm"; sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm";
}; };

2
pkgs/applications/networking/c14/default.nix
View file

@ -9,7 +9,7 @@ buildGoPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "online-net"; owner = "online-net";
repo = "c14-cli"; repo = "c14-cli";
rev = "${version}"; rev = version;
sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf"; sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf";
}; };

2
pkgs/applications/networking/cluster/hetzner-kube/default.nix
View file

@ -7,7 +7,7 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xetys"; owner = "xetys";
repo = "hetzner-kube"; repo = "hetzner-kube";
rev = "${version}"; rev = version;
sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0"; sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0";
}; };

2
pkgs/applications/networking/cluster/kubernetes/default.nix
View file

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
patchShebangs ./hack patchShebangs ./hack
''; '';
WHAT="${concatStringsSep " " components}"; WHAT=concatStringsSep " " components;
postBuild = '' postBuild = ''
./hack/update-generated-docs.sh ./hack/update-generated-docs.sh

2
pkgs/applications/networking/cluster/kubetail/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "johanhaleby"; owner = "johanhaleby";
repo = "kubetail"; repo = "kubetail";
rev = "${version}"; rev = version;
sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr"; sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr";
}; };

2
pkgs/applications/networking/cluster/sonobuoy/default.nix
View file

@ -10,7 +10,7 @@ buildGoPackage rec {
goPackagePath = "github.com/heptio/sonobuoy"; goPackagePath = "github.com/heptio/sonobuoy";
buildFlagsArray = buildFlagsArray =
let t = "${goPackagePath}"; let t = goPackagePath;
in '' in ''
-ldflags= -ldflags=
-s -X ${t}/pkg/buildinfo.Version=${version} -s -X ${t}/pkg/buildinfo.Version=${version}

2
pkgs/applications/networking/cluster/stern/default.nix
View file

@ -11,7 +11,7 @@ buildGoPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wercker"; owner = "wercker";
repo = "stern"; repo = "stern";
rev = "${version}"; rev = version;
sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n";
}; };

2
pkgs/applications/networking/gdrive/default.nix
View file

@ -3,7 +3,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "gdrive"; pname = "gdrive";
version = "2.1.0"; version = "2.1.0";
rev = "${version}"; rev = version;
goPackagePath = "github.com/prasmussen/gdrive"; goPackagePath = "github.com/prasmussen/gdrive";

4
pkgs/applications/networking/instant-messengers/linphone/default.nix
View file

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BelledonneCommunications"; owner = "BelledonneCommunications";
repo = "${baseName}"; repo = baseName;
rev = "${version}"; rev = version;
sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
}; };

2
pkgs/applications/networking/instant-messengers/oysttyer/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "oysttyer"; owner = "oysttyer";
repo = "oysttyer"; repo = "oysttyer";
rev = "${version}"; rev = version;
sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2";
}; };

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
url = "https://github.com/dreadatour/pidgin-mra"; url = "https://github.com/dreadatour/pidgin-mra";
rev = "${version}"; rev = version;
sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw";
}; };

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchhg { src = fetchhg {
url = "https://bitbucket.org/olegoandreev/purple-vk-plugin"; url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
rev = "${version}"; rev = version;
sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc"; sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc";
}; };

2
pkgs/applications/networking/instant-messengers/profanity/default.nix
View file

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "profanity-im"; owner = "profanity-im";
repo = "profanity"; repo = "profanity";
rev = "${version}"; rev = version;
sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z"; sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z";
}; };

2
pkgs/applications/networking/instant-messengers/psi-plus/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "psi-plus"; owner = "psi-plus";
repo = "psi-plus-snapshots"; repo = "psi-plus-snapshots";
rev = "${version}"; rev = version;
sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q"; sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
}; };

8
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View file

@ -18,13 +18,13 @@ let
pname = "wire-desktop"; pname = "wire-desktop";
version = { version = {
"x86_64-linux" = "3.10.2904"; x86_64-linux = "3.10.2904";
"x86_64-darwin" = "3.10.3133"; x86_64-darwin = "3.10.3133";
}.${system} or throwSystem; }.${system} or throwSystem;
sha256 = { sha256 = {
"x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
"x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
}.${system} or throwSystem; }.${system} or throwSystem;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/applications/networking/mailreaders/mailpile/default.nix
View file

@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mailpile"; owner = "mailpile";
repo = "Mailpile"; repo = "Mailpile";
rev = "${version}"; rev = version;
sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj";
}; };

2
pkgs/applications/networking/ndppd/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DanielAdolfsson"; owner = "DanielAdolfsson";
repo = "ndppd"; repo = "ndppd";
rev = "${version}"; rev = version;
sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
}; };

2
pkgs/applications/networking/newsreaders/quiterss/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "QuiteRSS"; owner = "QuiteRSS";
repo = "quiterss"; repo = "quiterss";
rev = "${version}"; rev = version;
sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa"; sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
}; };

2
pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "transmission-remote-gtk"; owner = "transmission-remote-gtk";
repo = "transmission-remote-gtk"; repo = "transmission-remote-gtk";
rev = "${version}"; rev = version;
sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk"; sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk";
}; };

2
pkgs/applications/networking/ssb/patchwork/default.nix
View file

@ -11,7 +11,7 @@ let
}; };
binary = appimageTools.wrapType2 { binary = appimageTools.wrapType2 {
name = "${pname}"; name = pname;
inherit src; inherit src;
}; };
# we only use this to extract the icon # we only use this to extract the icon

2
pkgs/applications/office/libreoffice/default.nix
View file

@ -279,7 +279,7 @@ in stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"${if withHelp then "" else "--without-help"}" (if withHelp then "" else "--without-help")
"--with-boost=${boost.dev}" "--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib" "--with-boost-libdir=${boost.out}/lib"
"--with-beanshell-jar=${bsh}" "--with-beanshell-jar=${bsh}"

2
pkgs/applications/office/libreoffice/still.nix
View file

@ -279,7 +279,7 @@ in stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"${if withHelp then "" else "--without-help"}" (if withHelp then "" else "--without-help")
"--with-boost=${boost.dev}" "--with-boost=${boost.dev}"
"--with-boost-libdir=${boost.out}/lib" "--with-boost-libdir=${boost.out}/lib"
"--with-beanshell-jar=${bsh}" "--with-beanshell-jar=${bsh}"

2
pkgs/applications/office/libreoffice/wrapper.nix
View file

@ -2,7 +2,7 @@
let let
jdk = libreoffice.jdk; jdk = libreoffice.jdk;
in in
(runCommand "${libreoffice.name}" { (runCommand libreoffice.name {
inherit dbus libreoffice jdk bash; inherit dbus libreoffice jdk bash;
} '' } ''
mkdir -p "$out/bin" mkdir -p "$out/bin"

2
pkgs/applications/office/paperless/withConfig.nix
View file

@ -39,7 +39,7 @@ let
PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume"; PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume";
PAPERLESS_MEDIADIR = "${dataDir}/media"; PAPERLESS_MEDIADIR = "${dataDir}/media";
PAPERLESS_STATICDIR = "${dataDir}/static"; PAPERLESS_STATICDIR = "${dataDir}/static";
PAPERLESS_DBDIR = "${dataDir}"; PAPERLESS_DBDIR = dataDir;
}) // config; }) // config;
envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars; envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars;

2
pkgs/applications/office/wordgrinder/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "wordgrinder"; repo = "wordgrinder";
owner = "davidgiven"; owner = "davidgiven";
rev = "${version}"; rev = version;
sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal"; sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
}; };

2
pkgs/applications/radio/dablin/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Opendigitalradio"; owner = "Opendigitalradio";
repo = "dablin"; repo = "dablin";
rev = "${version}"; rev = version;
sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82"; sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82";
}; };

2
pkgs/applications/radio/multimon-ng/default.nix
View file

@ -9,7 +9,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EliasOenal"; owner = "EliasOenal";
repo = "multimon-ng"; repo = "multimon-ng";
rev = "${version}"; rev = version;
sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8"; sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8";
}; };

2
pkgs/applications/radio/qradiolink/default.nix
View file

@ -14,7 +14,7 @@ in stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kantooon"; owner = "kantooon";
repo = "qradiolink"; repo = "qradiolink";
rev = "${version}"; rev = version;
sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
}; };

2
pkgs/applications/radio/uhd/default.nix
View file

@ -27,7 +27,7 @@ in stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EttusResearch"; owner = "EttusResearch";
repo = "uhd"; repo = "uhd";
rev = "${uhdVer}"; rev = uhdVer;
sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy";
}; };

2
pkgs/applications/science/biology/eggnog-mapper/default.nix
View file

@ -7,7 +7,7 @@ python27Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "eggnogdb"; owner = "eggnogdb";
repo = "eggnog-mapper"; repo = "eggnog-mapper";
rev = "${version}"; rev = version;
sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv"; sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv";
}; };

4
pkgs/applications/science/chemistry/pymol/default.nix
View file

@ -13,8 +13,8 @@ let
description = "A Python-enhanced molecular graphics tool"; description = "A Python-enhanced molecular graphics tool";
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "${pname}"; name = pname;
exec = "${pname}"; exec = pname;
desktopName = "PyMol Molecular Graphics System"; desktopName = "PyMol Molecular Graphics System";
genericName = "Molecular Modeler"; genericName = "Molecular Modeler";
comment = description; comment = description;

2
pkgs/applications/science/electronics/kicad/default.nix
View file

@ -17,7 +17,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KiCad"; owner = "KiCad";
repo = "kicad-${name}"; repo = "kicad-${name}";
rev = "${version}"; rev = version;
inherit sha256 name; inherit sha256 name;
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/applications/science/math/sage/flask-oldsessions.nix
View file

@ -13,7 +13,7 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mitsuhiko"; owner = "mitsuhiko";
repo = "flask-oldsessions"; repo = "flask-oldsessions";
rev = "${version}"; rev = version;
sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn"; sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn";
}; };

2
pkgs/applications/science/math/sage/pybrial.nix
View file

@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BRiAl"; owner = "BRiAl";
repo = "BRiAl"; repo = "BRiAl";
rev = "${version}"; rev = version;
sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg"; sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
}; };

2
pkgs/applications/science/misc/simgrid/default.nix
View file

@ -13,7 +13,7 @@
with stdenv.lib; with stdenv.lib;
let let
optionOnOff = option: "${if option then "on" else "off"}"; optionOnOff = option: if option then "on" else "off";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

2
pkgs/applications/science/molecular-dynamics/lammps/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lammps"; owner = "lammps";
repo = "lammps"; repo = "lammps";
rev = "${version}"; rev = version;
sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj"; sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj";
}; };

2
pkgs/applications/science/robotics/apmplanner2/default.nix
View file

@ -10,7 +10,7 @@ mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ArduPilot"; owner = "ArduPilot";
repo = "apm_planner"; repo = "apm_planner";
rev = "${version}"; rev = version;
sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
}; };

2
pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
View file

@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = "git-secrets"; repo = "git-secrets";
rev = "${version}"; rev = version;
sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7"; sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
}; };

2
pkgs/applications/version-management/git-and-tools/gitweb/default.nix
View file

@ -18,7 +18,7 @@ in buildEnv {
name = "gitweb-${stdenv.lib.getVersion git}"; name = "gitweb-${stdenv.lib.getVersion git}";
ignoreCollisions = true; ignoreCollisions = true;
paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}" paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc
++ [ "${git}/share/gitweb" ]; ++ [ "${git}/share/gitweb" ];
meta = git.meta // { meta = git.meta // {

2
pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix
View file

@ -7,7 +7,7 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "languitar"; owner = "languitar";
repo = "pass-git-helper"; repo = "pass-git-helper";
rev = "${version}"; rev = version;
sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap";
}; };

2
pkgs/applications/version-management/git-review/default.nix
View file

@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
# Manually set version because prb wants to get it from the git # Manually set version because prb wants to get it from the git
# upstream repository (and we are installing from tarball instead) # upstream repository (and we are installing from tarball instead)
PBR_VERSION = "${version}"; PBR_VERSION = version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openstack-infra"; owner = "openstack-infra";

2
pkgs/applications/version-management/gitlab/default.nix
View file

@ -7,7 +7,7 @@ let
rubyEnv = bundlerEnv rec { rubyEnv = bundlerEnv rec {
name = "gitlab-env-${version}"; name = "gitlab-env-${version}";
inherit ruby; inherit ruby;
gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}"; gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce");
gemset = gemset =
let x = import (gemdir + "/gemset.nix"); let x = import (gemdir + "/gemset.nix");
in x // { in x // {

2
pkgs/applications/version-management/peru/default.nix
View file

@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "buildinspace"; owner = "buildinspace";
repo = "peru"; repo = "peru";
rev = "${version}"; rev = version;
sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a"; sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a";
}; };

2
pkgs/applications/version-management/yadm/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TheLocehiliosan"; owner = "TheLocehiliosan";
repo = "yadm"; repo = "yadm";
rev = "${version}"; rev = version;
sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6"; sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
}; };

2
pkgs/applications/video/kodi/plugins.nix
View file

@ -487,7 +487,7 @@ let self = rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "peak3d"; owner = "peak3d";
repo = "inputstream.adaptive"; repo = "inputstream.adaptive";
rev = "${version}"; rev = version;
sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
}; };

2
pkgs/applications/video/obs-studio/default.nix
View file

@ -42,7 +42,7 @@ in mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jp9000"; owner = "jp9000";
repo = "obs-studio"; repo = "obs-studio";
rev = "${version}"; rev = version;
sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz"; sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
}; };

Some files were not shown because too many files have changed in this diff Show more