mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 21:03:15 +00:00
Merge staging into staging-next
This commit is contained in:
Frederik Rietdijk
commit
5f95fdbb7d
@ -51,8 +51,8 @@ let
|
||||
then "fontconfig"
|
||||
else "fontconfig_${version}";
|
||||
makeCache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
|
||||
cache = makeCache pkgs."${fcPackage}";
|
||||
cache32 = makeCache pkgs.pkgsi686Linux."${fcPackage}";
|
||||
cache = makeCache pkgs.${fcPackage};
|
||||
cache32 = makeCache pkgs.pkgsi686Linux.${fcPackage};
|
||||
in
|
||||
pkgs.writeText "fc-00-nixos-cache.conf" ''
|
||||
<?xml version='1.0'?>
|
||||
|
||||
@ -94,8 +94,8 @@ in {
|
||||
ppdOptions = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
example = {
|
||||
"PageSize" = "A4";
|
||||
"Duplex" = "DuplexNoTumble";
|
||||
PageSize = "A4";
|
||||
Duplex = "DuplexNoTumble";
|
||||
};
|
||||
default = {};
|
||||
description = ''
|
||||
@ -110,7 +110,7 @@ in {
|
||||
};
|
||||
|
||||
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";
|
||||
in {
|
||||
description = "Ensure NixOS-configured CUPS printers";
|
||||
|
||||
@ -6,7 +6,7 @@ let
|
||||
cfg = config.programs.x2goserver;
|
||||
|
||||
defaults = {
|
||||
superenicer = { "enable" = cfg.superenicer.enable; };
|
||||
superenicer = { enable = cfg.superenicer.enable; };
|
||||
};
|
||||
confText = generators.toINI {} (recursiveUpdate defaults cfg.settings);
|
||||
x2goServerConf = pkgs.writeText "x2goserver.conf" confText;
|
||||
|
||||
@ -61,8 +61,8 @@ in {
|
||||
};
|
||||
|
||||
|
||||
users.groups."${cfg.group}" = {};
|
||||
users.users."${cfg.user}" =
|
||||
users.groups.${cfg.group} = {};
|
||||
users.users.${cfg.user} =
|
||||
if cfg.user == "roon-server" then {
|
||||
isSystemUser = true;
|
||||
description = "Roon Server user";
|
||||
|
||||
@ -47,7 +47,7 @@ in
|
||||
}];
|
||||
};
|
||||
|
||||
systemd.services."mk-docker-opts" = {
|
||||
systemd.services.mk-docker-opts = {
|
||||
description = "Pre-Docker Actions";
|
||||
path = with pkgs; [ gawk gnugrep ];
|
||||
script = ''
|
||||
@ -57,7 +57,7 @@ in
|
||||
serviceConfig.Type = "oneshot";
|
||||
};
|
||||
|
||||
systemd.paths."flannel-subnet-env" = {
|
||||
systemd.paths.flannel-subnet-env = {
|
||||
wantedBy = [ "flannel.service" ];
|
||||
pathConfig = {
|
||||
PathModified = "/run/flannel/subnet.env";
|
||||
|
||||
@ -390,7 +390,7 @@ in
|
||||
|
||||
systemd.targets = let
|
||||
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" ]; }; }
|
||||
] ++ optional cfg.mon.enable (makeTarget "mon")
|
||||
++ optional cfg.mds.enable (makeTarget "mds")
|
||||
|
||||
@ -168,7 +168,7 @@ in {
|
||||
disable-syslog = true;
|
||||
};
|
||||
|
||||
users.users."${username}" = {
|
||||
users.users.${username} = {
|
||||
home = dataDir;
|
||||
createHome = true;
|
||||
uid = config.ids.uids.pdns-recursor;
|
||||
|
||||
@ -165,7 +165,7 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
|
||||
"${poolName}" = {
|
||||
${poolName} = {
|
||||
user = "icingaweb2";
|
||||
phpOptions = ''
|
||||
extension = ${pkgs.phpPackages.imagick}/lib/php/extensions/imagick.so
|
||||
|
||||
@ -18,7 +18,7 @@ let
|
||||
global $CFG;
|
||||
$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->dbhost = '${cfg.database.host}';
|
||||
$CFG->dbname = '${cfg.database.name}';
|
||||
@ -92,8 +92,8 @@ in
|
||||
type = types.int;
|
||||
description = "Database host port.";
|
||||
default = {
|
||||
"mysql" = 3306;
|
||||
"pgsql" = 5432;
|
||||
mysql = 3306;
|
||||
pgsql = 5432;
|
||||
}.${cfg.database.type};
|
||||
defaultText = "3306";
|
||||
};
|
||||
@ -294,7 +294,7 @@ in
|
||||
|
||||
systemd.services.httpd.after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
|
||||
|
||||
users.users."${user}".group = group;
|
||||
users.users.${user}.group = group;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -179,7 +179,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
services.phpfpm.pools = {
|
||||
"${poolName}" = {
|
||||
${poolName} = {
|
||||
inherit (cfg) user group;
|
||||
|
||||
phpOptions = ''
|
||||
|
||||
@ -115,7 +115,7 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
|
||||
"${poolName}" = {
|
||||
${poolName} = {
|
||||
user = "nginx";
|
||||
settings = mapAttrs (name: mkDefault) {
|
||||
"listen.owner" = "nginx";
|
||||
|
||||
@ -520,7 +520,7 @@ let
|
||||
];
|
||||
|
||||
services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") {
|
||||
"${poolName}" = {
|
||||
${poolName} = {
|
||||
inherit (cfg) user;
|
||||
settings = mapAttrs (name: mkDefault) {
|
||||
"listen.owner" = "nginx";
|
||||
|
||||
@ -36,7 +36,7 @@ let
|
||||
|
||||
poolOpts = { name, ... }:
|
||||
let
|
||||
poolOpts = cfg.pools."${name}";
|
||||
poolOpts = cfg.pools.${name};
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
||||
@ -243,11 +243,11 @@ in
|
||||
services.geoclue2.enable = mkDefault true;
|
||||
services.geoclue2.enableDemoAgent = false; # GNOME has its own geoclue agent
|
||||
|
||||
services.geoclue2.appConfig."gnome-datetime-panel" = {
|
||||
services.geoclue2.appConfig.gnome-datetime-panel = {
|
||||
isAllowed = true;
|
||||
isSystem = true;
|
||||
};
|
||||
services.geoclue2.appConfig."gnome-color-panel" = {
|
||||
services.geoclue2.appConfig.gnome-color-panel = {
|
||||
isAllowed = true;
|
||||
isSystem = true;
|
||||
};
|
||||
|
||||
@ -72,7 +72,15 @@ in
|
||||
};
|
||||
in mkMerge [ {
|
||||
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: {
|
||||
netdevs = mkIf i.virtual ({
|
||||
|
||||
@ -9,6 +9,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
|
||||
machine =
|
||||
{ pkgs, lib, ... }:
|
||||
{ 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 =
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
longDescription = ''
|
||||
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;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
|
||||
@ -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.
|
||||
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;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "axoloti";
|
||||
repo = "axoloti";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1qffis277wshldr3i939b0r2x3a2mlr53samxqmr2nk1sfm2b4w9";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "CsoundQt";
|
||||
repo = "CsoundQt";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
|
||||
};
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "grame-cncm";
|
||||
repo = "faust";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "tomszilagyi";
|
||||
repo = "ir.lv2";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sadko4u";
|
||||
repo = "${pname}";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = "1dzpl7f354rwp37bkr9h2yyafykcdn6m1qqfshqg77fj0pcsw8r2";
|
||||
};
|
||||
|
||||
@ -9,7 +9,7 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "musescore-darwin";
|
||||
version = "${concatStringsSep "." versionComponents}";
|
||||
version = concatStringsSep "." versionComponents;
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg";
|
||||
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
and the engine can be run standalone on a computer without a monitor.
|
||||
'';
|
||||
|
||||
version = "${version}";
|
||||
version = version;
|
||||
homepage = http://essej.net/sooperlooper/index.html;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.magnetophon ];
|
||||
|
||||
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Spotifyd";
|
||||
repo = "spotifyd";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
|
||||
};
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
without audible degradation.
|
||||
'';
|
||||
|
||||
version = "${version}";
|
||||
version = version;
|
||||
homepage = http://shibatch.sourceforge.net/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ leenaars];
|
||||
|
||||
@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olilarkin";
|
||||
repo = "${pname}";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1w80cmiyzca1wirf5gypg3hcix1ky777id8wnd3k92mn1jf4a24y";
|
||||
};
|
||||
|
||||
@ -30,7 +30,7 @@ python2.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
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
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = let
|
||||
options = {
|
||||
BOOST_ROOT = "${boost}";
|
||||
BOOST_ROOT = boost;
|
||||
Boost_USE_STATIC_LIBS = "OFF";
|
||||
RAIBLOCKS_GUI = "ON";
|
||||
RAIBLOCKS_TEST = "ON";
|
||||
|
||||
@ -14,7 +14,7 @@ in pkgs.mkShell {
|
||||
pkgs.bash
|
||||
];
|
||||
|
||||
EMACS2NIX = "${src}";
|
||||
EMACS2NIX = src;
|
||||
|
||||
shellHook = ''
|
||||
export PATH=$PATH:${src}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elisp-ffi";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";
|
||||
};
|
||||
buildInputs = [ external.libffi ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ runCommand, makeWrapper, geany, gnome2 }:
|
||||
let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
|
||||
in
|
||||
runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } "
|
||||
runCommand name { nativeBuildInputs = [ makeWrapper ]; inherit (geany.meta); } "
|
||||
mkdir -p $out
|
||||
ln -s ${geany}/share $out
|
||||
makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
in {
|
||||
displayName = "Python 3";
|
||||
argv = [
|
||||
"${env.interpreter}"
|
||||
env.interpreter
|
||||
"-m"
|
||||
"ipykernel_launcher"
|
||||
"-f"
|
||||
|
||||
@ -35,7 +35,7 @@ in python.pkgs.buildPythonApplication {
|
||||
src = fetchFromGitHub {
|
||||
owner = "retext-project";
|
||||
repo = "retext";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1zcapywspc9v5zf5cxqkcy019np9n41gmryqixj66zsvd544c6si";
|
||||
};
|
||||
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
"x86_64-linux" = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
|
||||
"x86_64-darwin" = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
|
||||
x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q";
|
||||
x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
||||
@ -11,8 +11,8 @@ let
|
||||
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
"x86_64-linux" = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
|
||||
"x86_64-darwin" = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
|
||||
x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132";
|
||||
x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "${name}/src";
|
||||
|
||||
IPEPREFIX="${placeholder "out"}";
|
||||
IPEPREFIX=placeholder "out";
|
||||
URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
|
||||
LUA_PACKAGE = "lua";
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ let
|
||||
};
|
||||
|
||||
binary = appimageTools.wrapType2 {
|
||||
name = "${pname}";
|
||||
name = pname;
|
||||
inherit src;
|
||||
};
|
||||
# we only use this to extract the icon
|
||||
|
||||
@ -81,7 +81,7 @@ in stdenv.mkDerivation rec {
|
||||
LUPDATE="${qttools.dev}/bin/lupdate";
|
||||
LRELEASE="${qttools.dev}/bin/lrelease";
|
||||
MOC="${qtbase.dev}/bin/moc";
|
||||
QTDIR="${qtbase.dev}";
|
||||
QTDIR=qtbase.dev;
|
||||
RCC="${qtbase.dev}/bin/rcc";
|
||||
UIC="${qtbase.dev}/bin/uic";
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "geistesk";
|
||||
repo = "et";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
|
||||
};
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
src = fetchsvn {
|
||||
url = http://svn.openstreetmap.org/applications/rendering/gosmore;
|
||||
sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
ignoreExternals = true;
|
||||
};
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "alexandervdm";
|
||||
repo = "gummi";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
|
||||
};
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassxc";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1r63bl0cam04rps1bjr107qvwsmay4254nv00gwhh9n45s6cslac";
|
||||
};
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrVanDalo";
|
||||
repo = "memo";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0azx2bx6y7j0637fg3m8zigcw09zfm2mw9wjfg218sx88cm1wdkp";
|
||||
};
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
||||
# 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.
|
||||
# We need to set the path via the NLOPT environment variable instead.
|
||||
NLOPT = "${nlopt}";
|
||||
NLOPT = nlopt;
|
||||
|
||||
prePatch = ''
|
||||
# In nix ioctls.h isn't available from the standard kernel-headers package
|
||||
|
||||
@ -11,7 +11,7 @@ in mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "shundhammer";
|
||||
repo = "qdirstat";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0q4ccjmlbqifg251kyxwys8wspdskr8scqhacyfrs9cmnjxcjqan";
|
||||
};
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "sieren";
|
||||
repo = "QSyncthingTray";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w";
|
||||
};
|
||||
|
||||
|
||||
@ -8,12 +8,12 @@ let
|
||||
description = "A clone of the well-known terminal emulator rxvt";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "${pname}";
|
||||
name = pname;
|
||||
exec = "urxvt";
|
||||
icon = "utilities-terminal";
|
||||
comment = description;
|
||||
desktopName = "URxvt";
|
||||
genericName = "${pname}";
|
||||
genericName = pname;
|
||||
categories = "System;TerminalEmulator;";
|
||||
};
|
||||
in
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "IgnorantGuru";
|
||||
repo = "spacefm";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "089r6i40lxcwzp60553b18f130asspnzqldlpii53smz52kvpirx";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jmhobbs";
|
||||
repo = "terminal-parrot";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ buildGoPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "gammons";
|
||||
repo = "todolist";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihabunek";
|
||||
repo = "toot";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5";
|
||||
};
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "crosswire";
|
||||
repo = "xiphos";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
|
||||
};
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv'.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "fireice-uk";
|
||||
repo = "xmr-stak";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1p8hx8gwnv7a49pffq1xmzmrfi3gs6dyra9dn2xi7cl75yn9kfhm";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ buildGoPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "online-net";
|
||||
repo = "c14-cli";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0b1piviy6vvdbak8y8bc24rk3c1fi67vv3352pmnzvrhsar2r5yf";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ buildGoModule rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "xetys";
|
||||
repo = "hetzner-kube";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "11202i3340vaz8xh59gwj5x0djcgbzq9jfy2214lcpml71qc85f0";
|
||||
};
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
patchShebangs ./hack
|
||||
'';
|
||||
|
||||
WHAT="${concatStringsSep " " components}";
|
||||
WHAT=concatStringsSep " " components;
|
||||
|
||||
postBuild = ''
|
||||
./hack/update-generated-docs.sh
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "johanhaleby";
|
||||
repo = "kubetail";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr";
|
||||
};
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
goPackagePath = "github.com/heptio/sonobuoy";
|
||||
|
||||
buildFlagsArray =
|
||||
let t = "${goPackagePath}";
|
||||
let t = goPackagePath;
|
||||
in ''
|
||||
-ldflags=
|
||||
-s -X ${t}/pkg/buildinfo.Version=${version}
|
||||
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "wercker";
|
||||
repo = "stern";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n";
|
||||
};
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
buildGoPackage rec {
|
||||
pname = "gdrive";
|
||||
version = "2.1.0";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
|
||||
goPackagePath = "github.com/prasmussen/gdrive";
|
||||
|
||||
|
||||
@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BelledonneCommunications";
|
||||
repo = "${baseName}";
|
||||
rev = "${version}";
|
||||
repo = baseName;
|
||||
rev = version;
|
||||
sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j";
|
||||
};
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "oysttyer";
|
||||
repo = "oysttyer";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/dreadatour/pidgin-mra";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://bitbucket.org/olegoandreev/purple-vk-plugin";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "02p57fgx8ml00cbrb4f280ak2802svz80836dzk9f1zwm1bcr2qc";
|
||||
};
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "profanity-im";
|
||||
repo = "profanity";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "15adg7ndjkzy04lizjmnvv0pf0snhzp6a8x74mndcm0zma0dia0z";
|
||||
};
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
|
||||
};
|
||||
|
||||
|
||||
@ -18,13 +18,13 @@ let
|
||||
pname = "wire-desktop";
|
||||
|
||||
version = {
|
||||
"x86_64-linux" = "3.10.2904";
|
||||
"x86_64-darwin" = "3.10.3133";
|
||||
x86_64-linux = "3.10.2904";
|
||||
x86_64-darwin = "3.10.3133";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
sha256 = {
|
||||
"x86_64-linux" = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
|
||||
"x86_64-darwin" = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
|
||||
x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn";
|
||||
x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9";
|
||||
}.${system} or throwSystem;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -7,7 +7,7 @@ python2Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mailpile";
|
||||
repo = "Mailpile";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielAdolfsson";
|
||||
repo = "ndppd";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "QuiteRSS";
|
||||
repo = "quiterss";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
|
||||
};
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "transmission-remote-gtk";
|
||||
repo = "transmission-remote-gtk";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1pipc1f94jdppv597mqmcj2kw2rdvaqcbl512v7z8vir76p1a7gk";
|
||||
};
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ let
|
||||
};
|
||||
|
||||
binary = appimageTools.wrapType2 {
|
||||
name = "${pname}";
|
||||
name = pname;
|
||||
inherit src;
|
||||
};
|
||||
# we only use this to extract the icon
|
||||
|
||||
@ -279,7 +279,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"${if withHelp then "" else "--without-help"}"
|
||||
(if withHelp then "" else "--without-help")
|
||||
"--with-boost=${boost.dev}"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--with-beanshell-jar=${bsh}"
|
||||
|
||||
@ -279,7 +279,7 @@ in stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"${if withHelp then "" else "--without-help"}"
|
||||
(if withHelp then "" else "--without-help")
|
||||
"--with-boost=${boost.dev}"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--with-beanshell-jar=${bsh}"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
let
|
||||
jdk = libreoffice.jdk;
|
||||
in
|
||||
(runCommand "${libreoffice.name}" {
|
||||
(runCommand libreoffice.name {
|
||||
inherit dbus libreoffice jdk bash;
|
||||
} ''
|
||||
mkdir -p "$out/bin"
|
||||
|
||||
@ -39,7 +39,7 @@ let
|
||||
PAPERLESS_CONSUMPTION_DIR = "${dataDir}/consume";
|
||||
PAPERLESS_MEDIADIR = "${dataDir}/media";
|
||||
PAPERLESS_STATICDIR = "${dataDir}/static";
|
||||
PAPERLESS_DBDIR = "${dataDir}";
|
||||
PAPERLESS_DBDIR = dataDir;
|
||||
}) // config;
|
||||
|
||||
envVarDefs = mapAttrsToList (n: v: ''export ${n}="${toString v}"'') envVars;
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
repo = "wordgrinder";
|
||||
owner = "davidgiven";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "08lnq5wmspfqdjmqm15gizcq0xr7mg4h62qhvwj63v0sd6ks1cal";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "Opendigitalradio";
|
||||
repo = "dablin";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "04ir7yg7psnnb48s1qfppvvx6lak4s8f6fqdg721y2kd9129jm82";
|
||||
};
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "EliasOenal";
|
||||
repo = "multimon-ng";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1973xfyvzl1viz19zr83cgqlx5laxbjrca35rqabn6dlb6xb5xk8";
|
||||
};
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ in stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "kantooon";
|
||||
repo = "qradiolink";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi";
|
||||
};
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ in stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "EttusResearch";
|
||||
repo = "uhd";
|
||||
rev = "${uhdVer}";
|
||||
rev = uhdVer;
|
||||
sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ python27Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "eggnogdb";
|
||||
repo = "eggnog-mapper";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1aaaflppy84bhkh2hb5gnzm4xgrz0rz0cgfpadr9w8cva8p0sqdv";
|
||||
};
|
||||
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
description = "A Python-enhanced molecular graphics tool";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "${pname}";
|
||||
exec = "${pname}";
|
||||
name = pname;
|
||||
exec = pname;
|
||||
desktopName = "PyMol Molecular Graphics System";
|
||||
genericName = "Molecular Modeler";
|
||||
comment = description;
|
||||
|
||||
@ -17,7 +17,7 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "KiCad";
|
||||
repo = "kicad-${name}";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
inherit sha256 name;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "flask-oldsessions";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn";
|
||||
};
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "BRiAl";
|
||||
repo = "BRiAl";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
|
||||
};
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
optionOnOff = option: "${if option then "on" else "off"}";
|
||||
optionOnOff = option: if option then "on" else "off";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "lammps";
|
||||
repo = "lammps";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1dlifm9wm1jcw2zwal3fnzzl41ng08c7v48w6hx2mz84zljg1nsj";
|
||||
};
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArduPilot";
|
||||
repo = "apm_planner";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
|
||||
};
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "git-secrets";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "10lnxg0q855zi3d6804ivlrn6dc817kilzdh05mmz8a0ccvm2qc7";
|
||||
};
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ in buildEnv {
|
||||
name = "gitweb-${stdenv.lib.getVersion git}";
|
||||
|
||||
ignoreCollisions = true;
|
||||
paths = stdenv.lib.optional gitwebTheme "${gitwebThemeSrc}"
|
||||
paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc
|
||||
++ [ "${git}/share/gitweb" ];
|
||||
|
||||
meta = git.meta // {
|
||||
|
||||
@ -7,7 +7,7 @@ buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "languitar";
|
||||
repo = "pass-git-helper";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap";
|
||||
};
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
# Manually set version because prb wants to get it from the git
|
||||
# upstream repository (and we are installing from tarball instead)
|
||||
PBR_VERSION = "${version}";
|
||||
PBR_VERSION = version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstack-infra";
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
rubyEnv = bundlerEnv rec {
|
||||
name = "gitlab-env-${version}";
|
||||
inherit ruby;
|
||||
gemdir = ./rubyEnv- + "${if gitlabEnterprise then "ee" else "ce"}";
|
||||
gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce");
|
||||
gemset =
|
||||
let x = import (gemdir + "/gemset.nix");
|
||||
in x // {
|
||||
|
||||
@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildinspace";
|
||||
repo = "peru";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0p4j51m89glx12cd65lcnbwpvin0v49wkhrx06755skr7v37pm2a";
|
||||
};
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheLocehiliosan";
|
||||
repo = "yadm";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "0873jgks7dpfkj5km1jchxdrhf7lia70p0f8zsrh9p4crj5f4pc6";
|
||||
};
|
||||
|
||||
|
||||
@ -487,7 +487,7 @@ let self = rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "peak3d";
|
||||
repo = "inputstream.adaptive";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z";
|
||||
};
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ in mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jp9000";
|
||||
repo = "obs-studio";
|
||||
rev = "${version}";
|
||||
rev = version;
|
||||
sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz";
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user