Merge remote-tracking branch 'upstream/master' into HEAD

This commit is contained in:
Jörg Thalheim 2020-03-29 14:08:10 +01:00
commit 10059e4b71
No known key found for this signature in database
GPG key ID: 003F2096411B5F92
89 changed files with 1277 additions and 539 deletions

View file

@ -412,10 +412,15 @@
githubId = 20530052;
name = "Andrew Miloradovsky";
};
aminb = {
email = "amin@aminb.org";
github = "aminb";
notbandali = {
name = "Amin Bandali";
email = "bandali@gnu.org";
github = "notbandali";
githubId = 1254858;
keys = [{
longkeyid = "rsa4096/0xA21A020248816103";
fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103";
}];
};
aminechikhaoui = {
email = "amine.chikhaoui91@gmail.com";
@ -645,6 +650,12 @@
githubId = 10285250;
name = "Artur E. Ruuge";
};
asbachb = {
email = "asbachb-nixpkgs-5c2a@impl.it";
github = "asbachb";
githubId = 1482768;
name = "Benjamin Asbach";
};
ashalkhakov = {
email = "artyom.shalkhakov@gmail.com";
github = "ashalkhakov";
@ -8328,5 +8339,3 @@
name = "Xavier Zwirtz";
};
}

View file

@ -697,6 +697,66 @@ auth required pam_succeed_if.so uid >= 1000 quiet
</para>
</warning>
</listitem>
<listitem>
<para>
<package>Hydra</package> has gained a massive performance improvement due to
<link xlink:href="https://github.com/NixOS/hydra/pull/710">some database schema
changes</link> by adding several IDs and better indexing. However, it's necessary
to upgrade Hydra in multiple steps:
<itemizedlist>
<listitem>
<para>
At first, an older version of Hydra needs to be deployed which adds those
(nullable) columns. When having set <link linkend="opt-system.stateVersion">stateVersion
</link> to a value older than <literal>20.03</literal>, this package will be selected
by default from the module when upgrading. Otherwise, the package can be deployed using
the following config:
<programlisting>{ pkgs, ... }: {
<link linkend="opt-services.hydra.package">services.hydra.package</link> = pkgs.hydra-migration;
}</programlisting>
</para>
</listitem>
<listitem>
<para>
Automatically fill the newly added ID columns on the server by running the following
command:
<screen>
<prompt>$ </prompt>hydra-backfill-ids
</screen>
<warning>
<para>Please note that this process can take a while depending on your database-size!</para>
</warning>
</para>
</listitem>
<listitem>
<para>
Deploy a newer version of Hydra to activate the DB optimizations. You can choose from
either <package>hydra-unstable</package> (latest <literal>master</literal> compiled
against <package>nixUnstable</package>) and <package>hydra-flakes</package> (latest
version with flake-support).
<warning>
<para>
If your <link linkend="opt-system.stateVersion">stateVersion</link> is set to
<literal>20.03</literal> or greater, <package>hydra-unstable</package> will be used
automatically! This will break your setup if you didn't run the migration.
</para>
</warning>
Please note that Hydra is currently not available with <package>nixStable</package>
as this doesn't compile anymore.
</para>
</listitem>
</itemizedlist>
<warning>
<para>
<package>pkgs.hydra</package> has been removed to ensure a graceful database-migration
using the dedicated package-attributes. If you still have <package>pkgs.hydra</package>
defined in e.g. an overlay, an assertion error will be thrown. To circumvent this,
you need to set <xref linkend="opt-services.hydra.package" /> to <package>pkgs.hydra</package>
explicitly and make sure you know what you're doing!
</para>
</warning>
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -37,6 +37,8 @@ let
haveLocalDB = cfg.dbi == localDB;
inherit (config.system) stateVersion;
in
{
@ -63,8 +65,7 @@ in
};
package = mkOption {
type = types.path;
default = pkgs.hydra;
type = types.package;
defaultText = "pkgs.hydra";
description = "The Hydra package.";
};
@ -194,6 +195,34 @@ in
config = mkIf cfg.enable {
warnings = optional (cfg.package.migration or false) ''
You're currently deploying an older version of Hydra which is needed to
make some required database changes[1]. As soon as this is done, it's recommended
to run `hydra-backfill-ids` and set `services.hydra.package` to either `pkgs.hydra-unstable`
or `pkgs.hydra-flakes` after that.
[1] https://github.com/NixOS/hydra/pull/711
'';
services.hydra.package = with pkgs;
mkDefault (
if pkgs ? hydra
then throw ''
The Hydra package doesn't exist anymore in `nixpkgs`! It probably exists
due to an overlay. To upgrade Hydra, you need to take two steps as some
bigger changes in the database schema were implemented recently[1]. You first
need to deploy `pkgs.hydra-migration`, run `hydra-backfill-ids` on the server
and then deploy either `pkgs.hydra-unstable` or `pkgs.hydra-flakes`.
If you want to use `pkgs.hydra` from your overlay, please set `services.hydra.package`
explicitly to `pkgs.hydra` and make sure you know what you're doing.
[1] https://github.com/NixOS/hydra/pull/711
''
else if versionOlder stateVersion "20.03" then hydra-migration
else hydra-unstable
);
users.groups.hydra = {
gid = config.ids.gids.hydra;
};

View file

@ -77,6 +77,13 @@ in {
'';
};
package = mkOption {
type = types.path;
description = "The connman package / build flavor";
default = connman;
example = literalExample "pkgs.connmanFull";
};
};
};
@ -89,11 +96,13 @@ in {
assertion = !config.networking.useDHCP;
message = "You can not use services.connman with networking.useDHCP";
}{
# TODO: connman seemingly can be used along network manager and
# connmanFull supports this - so this should be worked out somehow
assertion = !config.networking.networkmanager.enable;
message = "You can not use services.connman with networking.networkmanager";
}];
environment.systemPackages = [ connman ];
environment.systemPackages = [ cfg.package ];
systemd.services.connman = {
description = "Connection service";
@ -105,7 +114,7 @@ in {
BusName = "net.connman";
Restart = "on-failure";
ExecStart = toString ([
"${pkgs.connman}/sbin/connmand"
"${cfg.package}/sbin/connmand"
"--config=${configFile}"
"--nodaemon"
] ++ optional enableIwd "--wifi=iwd_agent"
@ -122,7 +131,7 @@ in {
serviceConfig = {
Type = "dbus";
BusName = "net.connman.vpn";
ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n";
ExecStart = "${cfg.package}/sbin/connman-vpnd -n";
StandardOutput = "null";
};
};
@ -132,7 +141,7 @@ in {
serviceConfig = {
Name = "net.connman.vpn";
before = [ "connman" ];
ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n";
ExecStart = "${cfg.package}/sbin/connman-vpnd -n";
User = "root";
SystemdService = "connman-vpn.service";
};

View file

@ -176,7 +176,7 @@ let
${optionalString (cfg.httpConfig != "") ''
http {
${common.httpConfig}
${commonHttpConfig}
${cfg.httpConfig}
}''}

View file

@ -47,6 +47,7 @@ let
Path to the unix socket file on which to accept FastCGI requests.
<note><para>This option is read-only and managed by NixOS.</para></note>
'';
example = "${runtimeDir}/<name>.sock";
};
listen = mkOption {

View file

@ -121,12 +121,16 @@ in
handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {};
haproxy = handleTest ./haproxy.nix {};
hardened = handleTest ./hardened.nix {};
hibernate = handleTest ./hibernate.nix {};
# 9pnet_virtio used to mount /nix partition doesn't support
# hibernation. This test happens to work on x86_64-linux but
# not on other platforms.
hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {};
hitch = handleTest ./hitch {};
hocker-fetchdocker = handleTest ./hocker-fetchdocker {};
home-assistant = handleTest ./home-assistant.nix {};
hound = handleTest ./hound.nix {};
hydra = handleTest ./hydra {};
hydra-db-migration = handleTest ./hydra/db-migration.nix {};
i3wm = handleTest ./i3wm.nix {};
icingaweb2 = handleTest ./icingaweb2.nix {};
iftop = handleTest ./iftop.nix {};

View file

@ -0,0 +1,47 @@
{ system, ... }:
{
baseConfig = { pkgs, ... }: let
trivialJob = pkgs.writeTextDir "trivial.nix" ''
{ trivial = builtins.derivation {
name = "trivial";
system = "${system}";
builder = "/bin/sh";
allowSubstitutes = false;
preferLocalBuild = true;
args = ["-c" "echo success > $out; exit 0"];
};
}
'';
createTrivialProject = pkgs.stdenv.mkDerivation {
name = "create-trivial-project";
dontUnpack = true;
buildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
postFixup = ''
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
'';
};
in {
virtualisation.memorySize = 2048;
time.timeZone = "UTC";
environment.systemPackages = [ createTrivialProject pkgs.jq ];
services.hydra = {
enable = true;
# Hydra needs those settings to start up, so we add something not harmfull.
hydraURL = "example.com";
notificationSender = "example@example.com";
extraConfig = ''
email_notification = 1
'';
};
services.postfix.enable = true;
nix = {
buildMachines = [{
hostName = "localhost";
systems = [ system ];
}];
binaryCaches = [];
};
};
}

View file

@ -0,0 +1,86 @@
{ system ? builtins.currentSystem, ... }:
let inherit (import ./common.nix { inherit system; }) baseConfig; in
{ mig = import ../make-test-python.nix ({ pkgs, lib, ... }: {
name = "hydra-db-migration";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ma27 ];
};
nodes = {
original = { pkgs, lib, ... }: {
imports = [ baseConfig ];
# An older version of Hydra before the db change
# for testing purposes.
services.hydra.package = pkgs.hydra-migration.overrideAttrs (old: {
inherit (old) pname;
version = "2020-02-06";
src = pkgs.fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc";
sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick";
};
});
};
migration_phase1 = { pkgs, lib, ... }: {
imports = [ baseConfig ];
services.hydra.package = pkgs.hydra-migration;
};
finished = { pkgs, lib, ... }: {
imports = [ baseConfig ];
services.hydra.package = pkgs.hydra-unstable;
};
};
testScript = { nodes, ... }: let
next = nodes.migration_phase1.config.system.build.toplevel;
finished = nodes.finished.config.system.build.toplevel;
in ''
original.start()
original.wait_for_unit("multi-user.target")
original.wait_for_unit("postgresql.service")
original.wait_for_unit("hydra-init.service")
original.require_unit_state("hydra-queue-runner.service")
original.require_unit_state("hydra-evaluator.service")
original.require_unit_state("hydra-notify.service")
original.succeed("hydra-create-user admin --role admin --password admin")
original.wait_for_open_port(3000)
original.succeed("create-trivial-project.sh")
original.wait_until_succeeds(
'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
)
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
assert "jobset_id" not in out
original.succeed(
"${next}/bin/switch-to-configuration test >&2"
)
original.wait_for_unit("hydra-init.service")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
assert "jobset_id|integer|||" in out
original.succeed("hydra-backfill-ids")
original.succeed(
"${finished}/bin/switch-to-configuration test >&2"
)
original.wait_for_unit("hydra-init.service")
out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'")
assert "jobset_id|integer||not null|" in out
original.wait_until_succeeds(
'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
)
original.shutdown()
'';
});
}

View file

@ -3,102 +3,57 @@
, pkgs ? import ../../.. { inherit system config; }
}:
with import ../../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
trivialJob = pkgs.writeTextDir "trivial.nix" ''
{ trivial = builtins.derivation {
name = "trivial";
system = "${system}";
builder = "/bin/sh";
allowSubstitutes = false;
preferLocalBuild = true;
args = ["-c" "echo success > $out; exit 0"];
};
}
'';
inherit (import ./common.nix { inherit system; }) baseConfig;
createTrivialProject = pkgs.stdenv.mkDerivation {
name = "create-trivial-project";
dontUnpack = true;
buildInputs = [ pkgs.makeWrapper ];
installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
postFixup = ''
wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
hydraPkgs = {
inherit (pkgs) hydra-migration hydra-unstable hydra-flakes;
};
makeHydraTest = with pkgs.lib; name: package: makeTest {
name = "hydra-${name}";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ pstn lewo ma27 ];
};
machine = { pkgs, lib, ... }: {
imports = [ baseConfig ];
services.hydra = { inherit package; };
};
testScript = ''
# let the system boot up
machine.wait_for_unit("multi-user.target")
# test whether the database is running
machine.wait_for_unit("postgresql.service")
# test whether the actual hydra daemons are running
machine.wait_for_unit("hydra-init.service")
machine.require_unit_state("hydra-queue-runner.service")
machine.require_unit_state("hydra-evaluator.service")
machine.require_unit_state("hydra-notify.service")
machine.succeed("hydra-create-user admin --role admin --password admin")
# create a project with a trivial job
machine.wait_for_open_port(3000)
# make sure the build as been successfully built
machine.succeed("create-trivial-project.sh")
machine.wait_until_succeeds(
'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
)
machine.wait_until_succeeds(
'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'
)
'';
};
callTest = f: f { inherit system pkgs; };
hydraPkgs = {
inherit (pkgs) nixStable nixUnstable nixFlakes;
};
tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix:
callTest (import ../make-test-python.nix ({ pkgs, lib, ... }:
{
name = "hydra-with-${name}";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ pstn lewo ma27 ];
};
machine = { pkgs, ... }:
{
virtualisation.memorySize = 1024;
time.timeZone = "UTC";
environment.systemPackages = [ createTrivialProject pkgs.jq ];
services.hydra = {
enable = true;
#Hydra needs those settings to start up, so we add something not harmfull.
hydraURL = "example.com";
notificationSender = "example@example.com";
package = pkgs.hydra.override { inherit nix; };
extraConfig = ''
email_notification = 1
'';
};
services.postfix.enable = true;
nix = {
buildMachines = [{
hostName = "localhost";
systems = [ system ];
}];
binaryCaches = [];
};
};
testScript = ''
# let the system boot up
machine.wait_for_unit("multi-user.target")
# test whether the database is running
machine.wait_for_unit("postgresql.service")
# test whether the actual hydra daemons are running
machine.wait_for_unit("hydra-init.service")
machine.require_unit_state("hydra-queue-runner.service")
machine.require_unit_state("hydra-evaluator.service")
machine.require_unit_state("hydra-notify.service")
machine.succeed("hydra-create-user admin --role admin --password admin")
# create a project with a trivial job
machine.wait_for_open_port(3000)
# make sure the build as been successfully built
machine.succeed("create-trivial-project.sh")
machine.wait_until_succeeds(
'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq'
)
machine.wait_until_succeeds(
'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"'
)
'';
})));
in
tests
mapAttrs makeHydraTest hydraPkgs

View file

@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
nodes = {
node = {...}: {
environment.systemPackages = with pkgs; [
# mongodb-3_4
mongodb-3_4
mongodb-3_6
mongodb-4_0
];
@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
testScript = ''
node.start()
''
# + runMongoDBTest pkgs.mongodb-3_4
+ runMongoDBTest pkgs.mongodb-3_4
+ runMongoDBTest pkgs.mongodb-3_6
+ runMongoDBTest pkgs.mongodb-4_0
+ ''

View file

@ -1,29 +0,0 @@
{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }:
stdenv.mkDerivation rec {
pname = "avldrums.lv2";
version = "0.4.0";
src = fetchFromGitHub {
owner = "x42";
repo = pname;
rev = "v${version}";
sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv";
fetchSubmodules = true;
};
installFlags = [ "PREFIX=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
pango cairo libGLU lv2
];
meta = with stdenv.lib; {
description = "Dedicated AVLDrumkits LV2 Plugin";
homepage = http://x42-plugins.com/x42/x42-avldrums;
license = licenses.gpl2;
maintainers = [ maintainers.magnetophon ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

View file

@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec {
rustc
python3
wrapGAppsHook
glib
];
buildInputs = [

View file

@ -1,4 +1,4 @@
{ stdenv, mkDerivation, fetchFromGitHub, chromaprint
{ stdenv, mkDerivation, fetchurl, fetchFromGitHub, chromaprint
, fftw, flac, faad2, glibcLocales, mp4v2
, libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
, libGLU, libxcb, lilv, lv2, opusfile
@ -6,6 +6,17 @@
, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk
}:
let
# Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it
# with 2.4.1 instead.
libshout241 = libshout.overrideAttrs (o: rec {
name = "libshout-2.4.1";
src = fetchurl {
url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz";
sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k";
};
});
in
mkDerivation rec {
pname = "mixxx";
version = "2.2.3";
@ -19,7 +30,7 @@ mkDerivation rec {
nativeBuildInputs = [ scons.py2 ];
buildInputs = [
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout241 libsndfile
libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk
];

View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums";
homepage = https://x42-plugins.com/x42/x42-avldrums;
maintainers = with maintainers; [ orivej ];
maintainers = with maintainers; [ magnetophon orivej ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};

View file

@ -0,0 +1,42 @@
{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5
, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage
, appdirs, setuptools, qt5
}:
buildPythonApplication rec {
pname = "vorta";
version = "0.6.24";
src = fetchFromGitHub {
owner = "borgbase";
repo = "vorta";
rev = "v${version}";
sha256 = "1xc4cng4npc7g739qd909a8wim6s6sn8h8bb1wpxzg4gcnfyin8z";
};
postPatch = ''
sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg
'';
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
propagatedBuildInputs = [
paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle
secretstorage appdirs setuptools
];
# QT setup in tests broken.
doCheck = false;
postFixup = ''
wrapQtApp $out/bin/vorta
'';
meta = with lib; {
license = licenses.gpl3;
homepage = "https://vorta.borgbase.com/";
maintainers = with maintainers; [ ma27 ];
description = "Desktop Backup Client for Borg";
platforms = platforms.linux;
};
}

View file

@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf";
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin
nativeBuildInputs = [ cmake pkgconfig python3 ];
buildInputs = [ openssl xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ curl Security AppKit ]);
# Tests need to write to the theme directory in HOME.

View file

@ -3,7 +3,7 @@
}:
let
version = "11.2";
version = "11.3";
desktopItem = makeDesktopItem {
name = "netbeans";
exec = "netbeans";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
inherit version;
src = fetchurl {
url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
sha512 = "d589481808832c4f0391ee1ecb8e18202cebeee8bd844cb4bdbf6125113b41f9138a34c4c2ef1fdf228294ef8c24b242ffec9ba5fdc4f1d288db4a3f19ba1509";
sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6";
};
buildCommand = ''
@ -60,7 +60,7 @@ stdenv.mkDerivation {
description = "An integrated development environment for Java, C, C++ and PHP";
homepage = "https://netbeans.apache.org/";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ sander rszibele ];
maintainers = with stdenv.lib.maintainers; [ sander rszibele asbachb ];
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "12.6.5";
version = "12.9.3";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
sha256 = "14x4h680q3w9wsdmivy2k1bggb09vdm3a3wrpfwd79dbaagjk4lc";
sha256 = "1jhw3p5r9dgn7320ca9n6hzyv2x557a8m9mh80vgrccd6i2mgm5i";
};
nativeBuildInputs = [
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A desktop application for creating diagrams";
homepage = https://about.draw.io/;
homepage = "https://about.draw.io/";
license = licenses.asl20;
maintainers = with maintainers; [ danieldk ];
platforms = [ "x86_64-linux" ];

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
owner = "nebogeo";
repo = "fluxus";
rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400";
hash = "sha256:0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28";
sha256 = "0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28";
};
buildInputs = [

View file

@ -20,14 +20,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.17.1";
version = "0.17.2";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f";
sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq";
};
buildInputs = [

View file

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49";
sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh";
sha256 = "1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb";
})
];
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "A launcher/menu program for wlroots based wayland compositors such as sway";
homepage = "https://hg.sr.ht/~scoopta/wofi";
license = licenses.gpl3;
maintainers = with maintainers; [ erictapen ];
maintainers = with maintainers; [ elyhaka ];
platforms = with platforms; linux;
};
}

View file

@ -90,19 +90,19 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "9.0.6";
version = "9.0.7";
lang = "en-US";
srcs = {
x86_64-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
sha256 = "1vk1pww8zmpjd5snyfz0if9v17g140ymlp6navxp28snzlffahss";
sha256 = "11pgafa2lgj35s6kacy1b7pnzjg3ckqjxg0pf0aywxvc2qr3syv1";
};
i686-linux = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
sha256 = "0bhikdilfz31iilgb48mayy9f4lilycq24pqsrq7w3dqdjg4v55v";
sha256 = "1mjz41n53gxpaxx7jdxk226f085v23kwr31m20vv4ar4vxfa42d8";
};
};
in

View file

@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [
pkgconfig
asciidoctor
]
++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
gettext
] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]
buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ]
++ stdenv.lib.optional stdenv.isDarwin Security;
postBuild = ''

View file

@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec {
python3
rustc
wrapGAppsHook
glib
];
buildInputs = [
@ -84,4 +85,3 @@ rustPlatform.buildRustPackage rec {
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}

View file

@ -0,0 +1,25 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
pname = "matrix-dl-unstable";
version = "2019-09-22";
src = fetchFromGitHub {
owner = "rubo77";
repo = "matrix-dl";
rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69";
sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q";
};
propagatedBuildInputs = with python3Packages; [
matrix-client
];
meta = with lib; {
description = "Download backlogs from Matrix as raw text";
homepage = src.meta.homepage;
license = licenses.unfree;
maintainers = with maintainers; [ aw ];
platforms = platforms.unix;
};
}

View file

@ -70,7 +70,7 @@ in mkYarnPackage rec {
comment = meta.description;
categories = "Network;InstantMessaging;Chat;";
extraEntries = ''
StartupWMClass="riot"
StartupWMClass=riot
'';
};

View file

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "1.13.4";
version = "1.13.5";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm";
sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc";
};
patches = optional smimeSupport (fetchpatch {

View file

@ -10,13 +10,13 @@ with lib;
mkDerivation rec {
pname = "qbittorrent";
version = "4.2.1";
version = "4.2.2";
src = fetchFromGitHub {
owner = "qbittorrent";
repo = "qbittorrent";
rev = "release-${version}";
sha256 = "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil";
sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc";
};
# NOTE: 2018-05-31: CMake is working but it is not officially supported

View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, openssl, libsamplerate, alsaLib }:
{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }:
stdenv.mkDerivation rec {
pname = "pjsip";
version = "2.9";
version = "2.10";
src = fetchurl {
url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2";
sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi";
src = fetchFromGitHub {
owner = pname;
repo = "pjproject";
rev = version;
sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0";
};
patches = [ ./fix-aarch64.patch ];

View file

@ -9,6 +9,7 @@
, freetype
, gcc
, glib
, libssh2
, ncurses
, opencv
, openssl
@ -44,9 +45,11 @@ stdenv.mkDerivation rec {
gcc.cc
gcc.libc
glib
libssh2
ncurses
opencv
openssl
stdenv.cc.cc.lib
unixODBC
xkeyboard_config
libxml2
@ -93,7 +96,7 @@ stdenv.mkDerivation rec {
# Fix library paths
cd $out/libexec/Mathematica/Executables
for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do
sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path
sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}\n" $path
done
# Fix xkeyboard config path for Qt
@ -102,7 +105,7 @@ stdenv.mkDerivation rec {
done
# Remove some broken libraries
rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so*
rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so*
'';
preFixup = ''

View file

@ -7,6 +7,12 @@
let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
version = "12.1.0";
lang = "en";
language = "English";
sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7";
}
{
version = "12.0.0";
lang = "en";

View file

@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0shlh0m9k0iqxpv9zmiw7a6v197swrvpz9x6qzhximzkdwni9gz9";
buildInputs = [ pkgconfig ];
propagatedBuildInputs = [ openssl gmp ncurses ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl gmp ncurses ];
# Some tests fail and/or attempt to use internet servers.
doCheck = false;

View file

@ -30,9 +30,7 @@ let
diff-so-fancy = callPackage ./diff-so-fancy { };
gh = callPackage ./gh {
inherit (darwin.apple_sdk.frameworks) Security;
};
gh = callPackage ./gh { };
ghq = callPackage ./ghq { };

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }:
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
buildGoModule rec {
pname = "gh";
@ -20,7 +20,6 @@ buildGoModule rec {
subPackages = [ "cmd/gh" ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
postInstall = ''
for shell in bash fish zsh; do
$out/bin/gh completion -s $shell > gh.$shell
@ -28,7 +27,7 @@ buildGoModule rec {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "GitHub CLI tool";
homepage = "https://cli.github.com/";
license = licenses.mit;

View file

@ -31,6 +31,7 @@
, vdpauSupport ? true, libvdpau ? null
, useWayland ? false, wayland ? null, wayland-protocols ? null
, waylandpp ? null, libxkbcommon ? null
, useGbm ? false, mesa ? null, libinput ? null
}:
assert dbusSupport -> dbus != null;
@ -185,6 +186,11 @@ in stdenv.mkDerivation {
wayland waylandpp
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev
]
++ lib.optional useGbm [
libxkbcommon.dev
mesa.dev
libinput.dev
];
nativeBuildInputs = [
@ -207,6 +213,9 @@ in stdenv.mkDerivation {
] ++ lib.optional useWayland [
"-DCORE_PLATFORM_NAME=wayland"
"-DWAYLAND_RENDER_SYSTEM=gl"
] ++ lib.optional useGbm [
"-DCORE_PLATFORM_NAME=gbm"
"-DGBM_RENDER_SYSTEM=gles"
];
enableParallelBuilding = true;

View file

@ -2,13 +2,13 @@
buildPythonApplication rec {
pname = "plex-mpv-shim";
version = "1.7.12";
version = "1.7.14";
src = fetchFromGitHub {
owner = "iwalton3";
repo = pname;
rev = "v${version}";
sha256 = "0l13g4vkvcd1q4lkdkbgv4hgkx5pql6ym2fap35581z7rzy9jhkq";
sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza";
};
propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ];

View file

@ -20,7 +20,7 @@ let
buildTags = "apparmor seccomp selinux containers_image_ostree_stub";
in buildGoPackage rec {
project = "cri-o";
version = "1.17.0";
version = "1.17.1";
name = "${project}-${version}${flavor}";
goPackagePath = "github.com/${project}/${project}";
@ -29,7 +29,7 @@ in buildGoPackage rec {
owner = "cri-o";
repo = "cri-o";
rev = "v${version}";
sha256 = "0xjmylf0ww23qqcg7kw008px6608r4qq6q57pfqis0661kp6f24j";
sha256 = "0zipigjcnhcnn0w69dkd8312qb6z98l65ir175wp3jfvj4cx3g28";
};
outputs = [ "bin" "out" ];

View file

@ -2,10 +2,10 @@
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm,
systemd}:
stdenv.mkDerivation rec {
name = "spice-vdagent-0.19.0";
name = "spice-vdagent-0.20.0";
src = fetchurl {
url = "https://www.spice-space.org/download/releases/${name}.tar.bz2";
sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3";
sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf";
};
NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ];
postPatch = ''
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
to the client resolution
* Multiple displays
'';
homepage = https://www.spice-space.org/;
homepage = "https://www.spice-space.org/";
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.aboseley ];
platforms = stdenv.lib.platforms.linux;

View file

@ -14,7 +14,7 @@ if !buildTests then ''
fi
if [[ "$(ls -A target/lib)" ]]; then
mkdir -p $lib/lib
cp target/lib/* $lib/lib #*/
cp -r target/lib/* $lib/lib #*/
for library in $lib/lib/*.so $lib/lib/*.dylib; do #*/
ln -s $library $(echo $library | sed -e "s/-${metadata}//")
done
@ -26,7 +26,7 @@ if !buildTests then ''
if [[ -d target/bin ]]; then
if [[ "$(ls -A target/bin)" ]]; then
mkdir -p $out/bin
cp -P target/bin/* $out/bin # */
cp -rP target/bin/* $out/bin # */
fi
fi
runHook postInstall

View file

@ -14,7 +14,6 @@ build_lib() {
--crate-name $CRATE_NAME \
$lib_src \
--out-dir target/lib \
--emit=dep-info,link \
-L dependency=target/deps \
--cap-lints allow \
$LIB_RUSTC_OPTS \
@ -45,7 +44,6 @@ build_bin() {
--crate-type bin \
$BIN_RUSTC_OPTS \
--out-dir target/bin \
--emit=dep-info,link \
-L dependency=target/deps \
$LINK \
$EXTRA_LIB \

View file

@ -1,4 +1,14 @@
{ lib, buildRustCrate, runCommand, runCommandCC, writeTextFile, symlinkJoin, callPackage, releaseTools }:
{ lib
, buildRustCrate
, callPackage
, releaseTools
, runCommand
, runCommandCC
, stdenv
, symlinkJoin
, writeTextFile
}:
let
mkCrate = args: let
p = {
@ -94,6 +104,58 @@ let
''
);
/* Returns a derivation that asserts that the crate specified by `crateArgs`
has the specified files as output.
`name` is used as part of the derivation name that performs the checking.
`crateArgs` is passed to `mkCrate` to build the crate with `buildRustCrate`.
`expectedFiles` contains a list of expected file paths in the output. E.g.
`[ "./bin/my_binary" ]`.
`output` specifies the name of the output to use. By default, the default
output is used but e.g. `output = "lib";` will cause the lib output
to be checked instead. You do not need to specify any directories.
*/
assertOutputs = { name, crateArgs, expectedFiles, output? null }:
assert (builtins.isString name);
assert (builtins.isAttrs crateArgs);
assert (builtins.isList expectedFiles);
let
crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]);
crateOutput = if output == null then crate else crate."${output}";
expectedFilesFile = writeTextFile {
name = "expected-files-${name}";
text =
let sorted = builtins.sort (a: b: a<b) expectedFiles;
concatenated = builtins.concatStringsSep "\n" sorted;
in "${concatenated}\n";
};
in
runCommand "assert-outputs-${name}" {
} ''
local actualFiles=$(mktemp)
cd "${crateOutput}"
find . -type f | sort >$actualFiles
diff -q ${expectedFilesFile} $actualFiles >/dev/null || {
echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
echo === Got:
sed -e 's/^/ /' $actualFiles
echo === Expected:
sed -e 's/^/ /' ${expectedFilesFile}
echo === Diff:
diff -u ${expectedFilesFile} $actualFiles |\
tail -n +3 |\
sed -e 's/^/ /'
exit 1
}
touch $out
''
;
in rec {
tests = let
@ -284,12 +346,18 @@ let
];
};
buildInputs = let
compile = name: text: runCommandCC name {} ''
mkdir -p $out/lib
$CC -shared -o $out/lib/${name}.so ${writeTextFile {
compile = name: text: let
src = writeTextFile {
name = "${name}-src.c";
inherit text;
}}
};
in runCommandCC name {} ''
mkdir -p $out/lib
# Note: On darwin (which defaults to clang) we have to add
# `-undefined dynamic_lookup` as otherwise the compilation fails.
cc -shared \
${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \
-o $out/lib/${name}${stdenv.hostPlatform.extensions.sharedLibrary} ${src}
'';
b = compile "libb" ''
#include <stdio.h>
@ -346,7 +414,80 @@ let
};
};
brotliCrates = (callPackage ./brotli-crates.nix {});
in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {
tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases;
in tests // rec {
crateBinWithPathOutputs = assertOutputs {
name="crateBinWithPath";
crateArgs = {
crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }];
src = mkBin "src/foobar.rs";
};
expectedFiles = [
"./bin/test_binary1"
];
};
crateBinWithPathOutputsDebug = assertOutputs {
name="crateBinWithPath";
crateArgs = {
release = false;
crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }];
src = mkBin "src/foobar.rs";
};
expectedFiles = [
"./bin/test_binary1"
] ++ lib.optionals stdenv.isDarwin [
# On Darwin, the debug symbols are in a seperate directory.
"./bin/test_binary1.dSYM/Contents/Info.plist"
"./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
];
};
crateBinNoPath1Outputs = assertOutputs {
name="crateBinNoPath1";
crateArgs = {
crateBin = [{ name = "my-binary2"; }];
src = mkBin "src/my_binary2.rs";
};
expectedFiles = [
"./bin/my-binary2"
];
};
crateLibOutputs = assertOutputs {
name="crateLib";
output="lib";
crateArgs = {
libName = "test_lib";
type = [ "rlib" ];
libPath = "src/lib.rs";
src = mkLib "src/lib.rs";
};
expectedFiles = [
"./nix-support/propagated-build-inputs"
"./lib/libtest_lib-042a1fdbef.rlib"
"./lib/link"
];
};
crateLibOutputsDebug = assertOutputs {
name="crateLib";
output="lib";
crateArgs = {
release = false;
libName = "test_lib";
type = [ "rlib" ];
libPath = "src/lib.rs";
src = mkLib "src/lib.rs";
};
expectedFiles = [
"./nix-support/propagated-build-inputs"
"./lib/libtest_lib-042a1fdbef.rlib"
"./lib/link"
];
};
brotliTest = let
pkg = brotliCrates.brotli_2_5_0 {};
in runCommand "run-brotli-test-cmd" {

View file

@ -0,0 +1,38 @@
{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "iconpack-jade";
version = "1.22";
src = fetchFromGitHub {
owner = "madmaxms";
repo = pname;
rev = "v${version}";
sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x";
};
nativeBuildInputs = [ gtk3 ];
propagatedBuildInputs = [ hicolor-icon-theme ];
dontDropIconThemeCache = true;
installPhase = ''
mkdir -p $out/share/icons
cp -a Jade* $out/share/icons
'';
postFixup = ''
for theme in $out/share/icons/*; do
gtk-update-icon-cache $theme
done
'';
meta = with stdenv.lib; {
description = "Icon pack based upon Faenza and Mint-X";
homepage = "https://github.com/madmaxms/iconpack-jade";
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.romildo ];
};
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "theme-jade1";
version = "1.6";
version = "1.7";
src = fetchFromGitHub {
owner = "madmaxms";
repo = "theme-jade-1";
rev = "v${version}";
sha256 = "1lnajrsikw6dljf6dvgmj8aqwywmgdp34h3xsc0xiyq07arhp606";
sha256 = "19vg95bf0ylmfhg0frs2k0k7c0wfn933h06wrklb9p5qy84hfig3";
};
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
description = "Based on Linux Mint theme with dark menus and more intensive green";
homepage = "https://github.com/madmaxms/theme-jade-1";
license = with licenses; [ gpl3 ];
platforms = platforms.linux;

View file

@ -3,17 +3,25 @@
let
params = {
"8.8" = {
version = "1.1";
sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h";
buildInputs = [ coq.ocamlPackages.camlp5 ];
};
"8.9" = {
sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5";
version = "1.1.1";
sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9";
buildInputs = [ coq.ocamlPackages.camlp5 ];
};
"8.10" = {
version = "1.1.1";
sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df";
};
};
param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
version = "1.1";
inherit (param) version;
name = "coq${coq.coq-version}-coqhammer-${version}";
src = fetchFromGitHub {
@ -31,8 +39,8 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ coq ] ++ (with coq.ocamlPackages; [
ocaml findlib camlp5
]);
ocaml findlib
]) ++ (param.buildInputs or []);
preInstall = ''
mkdir -p $out/bin

View file

@ -3,33 +3,40 @@
let params =
{
"8.7" = {
version = "1.1.1+coq8.7";
sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l";
sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj";
buildInputs = [ coq.ocamlPackages.camlp5 ];
};
"8.8" = {
version = "1.1.1";
sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh";
sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0";
buildInputs = [ coq.ocamlPackages.camlp5 ];
};
"8.9" = {
version = "1.1.1+coq8.9";
sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll";
sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk";
buildInputs = [ coq.ocamlPackages.camlp5 ];
};
"8.10" = {
sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8";
};
"8.11" = {
sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa";
};
};
param = params.${coq.coq-version};
in
stdenv.mkDerivation rec {
inherit (param) version;
version = "1.1.2";
name = "coq${coq.coq-version}-paramcoq-${version}";
src = fetchFromGitHub {
owner = "coq-community";
repo = "paramcoq";
rev = "v${version}";
rev = "v${version}+coq${coq.coq-version}";
inherit (param) sha256;
};
buildInputs = [ coq ]
++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ])
++ (with coq.ocamlPackages; [ ocaml findlib ])
++ (param.buildInputs or [])
;
installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];

View file

@ -3,8 +3,8 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "22.1.7";
sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62";
version = "22.3";
sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27";
prePatch = ''
substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}"

View file

@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
, fetchpatch
, zlib
, expat
, cmake
@ -23,6 +24,16 @@ stdenv.mkDerivation rec {
sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf";
};
patches = [
# included in next release
(fetchpatch {
name = "cve-2019-20421.patch";
url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch";
sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc";
excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ];
})
];
cmakeFlags = [
"-DEXIV2_BUILD_PO=ON"
"-DEXIV2_BUILD_DOC=ON"

View file

@ -3,7 +3,7 @@
}:
let
version = "1.1.11";
version = "1.2.5";
formattedVersion = lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen
@ -17,13 +17,14 @@ in stdenv.mkDerivation {
src = fetchFromGitHub {
owner = "arvidn";
repo = "libtorrent";
rev = "libtorrent_${formattedVersion}";
rev = "libtorrent-${formattedVersion}";
sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l";
};
enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
preConfigure = "./autotool.sh";
postInstall = ''

View file

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "subunit";
version = "1.1.0";
version = "1.4.0";
src = fetchurl {
url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz";
sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8";
sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80";
};
nativeBuildInputs = [ pkgconfig ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A streaming protocol for test results";
homepage = https://launchpad.net/subunit;
homepage = "https://launchpad.net/subunit";
license = licenses.asl20;
platforms = platforms.all;
};

View file

@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage {
};
luv = buildLuarocksPackage {
pname = "luv";
version = "1.34.1-1";
version = "1.30.0-0";
src = fetchurl {
url = https://luarocks.org/luv-1.34.1-1.src.rock;
sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0";
url = https://luarocks.org/luv-1.30.0-0.src.rock;
sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];

View file

@ -5,11 +5,12 @@
}:
buildPythonPackage rec {
pname = "3to2";
pname = "py3to2";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
inherit version;
pname = "3to2";
extension = "zip";
sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c";
};

View file

@ -14,6 +14,8 @@
, gmsh
, python
, stdenv
, openssh
, fetchurl
}:
let
@ -21,12 +23,11 @@ let
in
buildPythonPackage rec {
pname = "fipy";
version = "3.3";
version = "3.4.1";
src = fetchPypi {
pname = "FiPy";
inherit version;
sha256 = "11agpg3d6yrns8igkpml1mxy3mkqkjq2yrw1mw12y07dkk12ii19";
src = fetchurl {
url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz";
sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk";
};
propagatedBuildInputs = [
@ -38,11 +39,13 @@ in
mpi4py
future
scikit-fmm
openssh
] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs;
checkInputs = not_darwin_inputs;
checkPhase = ''
export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh
${python.interpreter} setup.py test --modules
'';

View file

@ -13,10 +13,11 @@ buildPythonPackage rec {
checkPhase = ''
touch Makefile
# Disable tests that require network access or access /home
# Disable tests that require network access or access /home or assume execution before year 2020
py.test test \
-k "not test_public_servers and not test_real_ftp \
and not test_set_parser and not test_repr"
and not test_set_parser and not test_repr \
and not test_conditional_upload and not test_conditional_download_with_older_target"
'';
meta = with lib; {

View file

@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "globus-sdk";
version = "1.8.0";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz";
sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2";
};
checkPhase = ''

View file

@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "mayavi";
version = "4.7.0";
version = "4.7.1";
src = fetchPypi {
inherit pname version;
extension = "tar.bz2";
sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44";
sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy";
};
# Discovery of 'vtk' in setuptools is not working properly, due to a missing
@ -30,7 +30,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "3D visualization of scientific data in Python";
homepage = https://github.com/enthought/mayavi;
homepage = "https://github.com/enthought/mayavi";
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
license = licenses.bsdOriginal;
};

View file

@ -3,22 +3,23 @@
, fetchFromGitHub
, mock
, pytest
, requests
, unittest2
, six
}:
buildPythonPackage rec {
pname = "ntlm-auth";
version = "1.0.3";
version = "1.4.0";
src = fetchFromGitHub {
owner = "jborean93";
repo = "ntlm-auth";
rev = "v${version}";
sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
sha256 = "168k3ygwbvnfcwn7q1nv3vvy6b9jc4cnpix0xgg5j8av7v1x0grn";
};
checkInputs = [ mock pytest unittest2 ];
checkInputs = [ mock pytest requests unittest2 ];
propagatedBuildInputs = [ six ];
# Functional tests require networking
@ -28,8 +29,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "Calculates NTLM Authentication codes";
homepage = https://github.com/jborean93/ntlm-auth;
license = licenses.lgpl3;
homepage = "https://github.com/jborean93/ntlm-auth";
license = licenses.mit;
maintainers = with maintainers; [ elasticdog ];
platforms = platforms.all;
};

View file

@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "qdarkstyle";
version = "2.8";
version = "2.8.1";
src = fetchPypi {
inherit version;
pname = "QDarkStyle";
sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475";
sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym";
};
# No tests available
@ -22,7 +22,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "A dark stylesheet for Python and Qt applications";
homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet;
homepage = "https://github.com/ColinDuquesnoy/QDarkStyleSheet";
license = licenses.mit;
maintainers = with maintainers; [ nyanloutre ];
};

View file

@ -13,11 +13,11 @@
buildPythonPackage rec {
name = "sfepy_${version}";
version = "2019.2";
version = "2019.4";
src = fetchurl {
url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz";
sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj";
sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn";
};
propagatedBuildInputs = [
@ -33,6 +33,7 @@ buildPythonPackage rec {
postPatch = ''
# broken test
rm tests/test_homogenization_perfusion.py
rm tests/test_splinebox.py
# slow tests
rm tests/test_input_*.py

View file

@ -0,0 +1,32 @@
{ buildPythonPackage
, fetchPypi
, pytestrunner
, setuptools_scm
, pytest
, lib
}:
buildPythonPackage rec {
pname = "variants";
version = "0.2.0";
src = fetchPypi {
inherit pname version ;
sha256 = "511f75b4cf7483c27e4d86d9accf2b5317267900c166d17636beeed118929b90";
};
nativeBuildInputs = [
pytestrunner
setuptools_scm
];
checkInputs = [
pytest
];
meta = with lib; {
description = "Library providing syntactic sugar for creating variant forms of a canonical function";
homepage = "https://github.com/python-variants/variants";
license = licenses.asl20;
maintainers = with maintainers; [ rakesh4g ];
};
}

View file

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "xml2rfc";
version = "2.37.3";
version = "2.41.0";
src = fetchPypi {
inherit pname version;
sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad";
sha256 = "0xmhgn62a8a7282yd003zz63mrgyajb6sg29bfyllx3mxmdlb0iz";
};
propagatedBuildInputs = [
@ -36,7 +36,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Tool generating IETF RFCs and drafts from XML sources";
homepage = https://tools.ietf.org/tools/xml2rfc/trac/;
homepage = "https://tools.ietf.org/tools/xml2rfc/trac/";
# Well, parts might be considered unfree, if being strict; see:
# http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
license = licenses.bsd3;

View file

@ -45,7 +45,7 @@ let generic = { major, version, src }:
downloadPage = http://alloytools.org/download.html;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ aminb ];
maintainers = with maintainers; [ notbandali ];
};
};

View file

@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ makeWrapper ];
propagatedBuildInputs = with qt5; [
qt5.qtbase
@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec {
qtsvg
qtquickcontrols2
qtgraphicaleffects
pkgconfig
git
];

View file

@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [
pkgconfig
openssl
];
meta = with stdenv.lib; {

View file

@ -0,0 +1,134 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
, migration ? false
}:
with stdenv;
if lib.versions.major nix.version == "1"
then throw "This Hydra version doesn't support Nix 1.x"
else
let
perlDeps = buildEnv {
name = "hydra-perl-deps";
paths = with perlPackages; lib.closePropagation
[ ModulePluggable
CatalystActionREST
CatalystAuthenticationStoreDBIxClass
CatalystDevel
CatalystDispatchTypeRegex
CatalystPluginAccessLog
CatalystPluginAuthorizationRoles
CatalystPluginCaptcha
CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace
CatalystRuntime
CatalystTraitForRequestProxyBase
CatalystViewDownload
CatalystViewJSON
CatalystViewTT
CatalystXScriptServerStarman
CatalystXRoleApplicator
CryptRandPasswd
DBDPg
DBDSQLite
DataDump
DateTime
DigestSHA1
EmailMIME
EmailSender
FileSlurp
IOCompress
IPCRun
JSON
JSONAny
JSONXS
LWP
LWPProtocolHttps
NetAmazonS3
NetPrometheus
NetStatsd
PadWalker
Readonly
SQLSplitStatement
SetScalar
Starman
SysHostnameLong
TermSizeAny
TextDiff
TextTable
XMLSimple
nix
nix.perl-bindings
git
boehmgc
];
};
in stdenv.mkDerivation rec {
pname = "hydra";
inherit stdenv src version;
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt
perlDeps perl nix
postgresql # for running the tests
nlohmann_json
boost
];
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = "-pthread";
shellHook = ''
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
'';
enableParallelBuilding = true;
preCheck = ''
patchShebangs .
export LOGNAME=''${LOGNAME:-foo}
'';
postInstall = ''
mkdir -p $out/nix-support
for i in $out/bin/*; do
read -n 4 chars < $i
if [[ $chars =~ ELF ]]; then continue; fi
wrapProgram $i \
--prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
--prefix PATH ':' $out/bin:$hydraPath \
--set HYDRA_RELEASE ${version} \
--set HYDRA_HOME $out/libexec/hydra \
--set NIX_RELEASE ${nix.name or "unknown"}
done
''; # */
dontStrip = true;
passthru = { inherit perlDeps migration; };
meta = with stdenv.lib; {
description = "Nix-based continuous build system";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ ma27 ];
};
}

View file

@ -1,143 +1,42 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, gitAndTools, mercurial, darcs, subversion, bazaar, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook
}:
{ fetchFromGitHub, nixStable, nixUnstable, callPackage, nixFlakes }:
with stdenv;
if lib.versions.major nix.version == "1"
then throw "This Hydra version doesn't support Nix 1.x"
else
let
perlDeps = buildEnv {
name = "hydra-perl-deps";
paths = with perlPackages; lib.closePropagation
[ ModulePluggable
CatalystActionREST
CatalystAuthenticationStoreDBIxClass
CatalystDevel
CatalystDispatchTypeRegex
CatalystPluginAccessLog
CatalystPluginAuthorizationRoles
CatalystPluginCaptcha
CatalystPluginSessionStateCookie
CatalystPluginSessionStoreFastMmap
CatalystPluginStackTrace
CatalystPluginUnicodeEncoding
CatalystTraitForRequestProxyBase
CatalystViewDownload
CatalystViewJSON
CatalystViewTT
CatalystXScriptServerStarman
CatalystXRoleApplicator
CryptRandPasswd
DBDPg
DBDSQLite
DataDump
DateTime
DigestSHA1
EmailMIME
EmailSender
FileSlurp
IOCompress
IPCRun
JSON
JSONAny
JSONXS
LWP
LWPProtocolHttps
NetAmazonS3
NetPrometheus
NetStatsd
PadWalker
Readonly
SQLSplitStatement
SetScalar
Starman
SysHostnameLong
TermSizeAny
TestMore
TextDiff
TextTable
XMLSimple
nix
nix.perl-bindings
git
boehmgc
];
};
in stdenv.mkDerivation rec {
pname = "hydra";
version = "2020-02-06";
inherit stdenv;
src = fetchFromGitHub {
owner = "NixOS";
repo = pname;
rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc";
sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick";
{
# Package for phase-1 of the db migration for Hydra.
# https://github.com/NixOS/hydra/pull/711
hydra-migration = callPackage ./common.nix {
version = "2020-02-10";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a";
sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3";
};
nix = nixStable;
migration = true;
};
buildInputs =
[ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx
gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt
guile # optional, for Guile + Guix support
perlDeps perl nix
postgresql # for running the tests
nlohmann_json
boost
];
# Hydra from latest master (or flakes) branch. Contains breaking changes,
# so when having an older version, `pkgs.hydra-migration` should be deployed first.
hydraPath = lib.makeBinPath (
[ sqlite subversion openssh nix coreutils findutils pixz
gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
hydra-unstable = callPackage ./common.nix {
version = "2020-03-24";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "12cc46cdb36321acd4c982429a86eb0f8f3cc969";
sha256 = "10ipxzdxr47c8w5jg69mbax2ykc7lb5fs9bbdd3iai9wzyfz17ln";
};
nix = nixUnstable;
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
NIX_CFLAGS_COMPILE = "-pthread";
shellHook = ''
PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH
PERL5LIB=$(pwd)/src/lib:$PERL5LIB;
'';
enableParallelBuilding = true;
preCheck = ''
patchShebangs .
export LOGNAME=''${LOGNAME:-foo}
'';
postInstall = ''
mkdir -p $out/nix-support
for i in $out/bin/*; do
read -n 4 chars < $i
if [[ $chars =~ ELF ]]; then continue; fi
wrapProgram $i \
--prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \
--prefix PATH ':' $out/bin:$hydraPath \
--set HYDRA_RELEASE ${version} \
--set HYDRA_HOME $out/libexec/hydra \
--set NIX_RELEASE ${nix.name or "unknown"}
done
''; # */
dontStrip = true;
passthru.perlDeps = perlDeps;
meta = with stdenv.lib; {
description = "Nix-based continuous build system";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ ma27 ];
hydra-flakes = callPackage ./common.nix {
version = "2020-03-27";
src = fetchFromGitHub {
owner = "NixOS";
repo = "hydra";
rev = "a7540b141d085a7e78c21fda8e8c05907c659b34";
sha256 = "08fs7593w5zs8vh4c66gvrxk6s840pp6hj8nwf51wsa27kg5a943";
};
nix = nixFlakes;
};
}

View file

@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl";
buildInputs = [ llvmPackages.libclang llvmPackages.clang ];
nativeBuildInputs = [ llvmPackages.clang ];
buildInputs = [ llvmPackages.libclang ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
postInstall = ''

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-asm";
version = "0.1.17";
version = "2019-12-24";
src = fetchFromGitHub {
owner = "gnzlbg";
repo = "cargo-asm";
rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145";
sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws";
rev = "577f890ebd4a09c8265710261e976fe7bfce8668";
sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb";
};
cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb";
cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

View file

@ -1,8 +1,9 @@
{ stdenv, fetchurl
, p7zip, pkgconfig
, p7zip, pkgconfig, libicns
, libX11, libXv
, udev
, libGLU, libGL, SDL
, Carbon, Cocoa, OpenGL, OpenAL
, libao, openal, libpulseaudio
, gtk2, gtksourceview
, runtimeShell }:
@ -21,11 +22,24 @@ stdenv.mkDerivation rec {
};
patches = [ ./0001-change-flags.diff ];
postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp";
postPatch = ''
sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp
for file in icarus/GNUmakefile higan/target-tomoko/GNUmakefile; do
substituteInPlace "$file" \
--replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \
'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png'
done
'';
nativeBuildInputs = [ p7zip pkgconfig ]
++ optional stdenv.isDarwin [ libicns ];
buildInputs =
[ p7zip pkgconfig libX11 libXv udev libGLU libGL
SDL libao openal libpulseaudio gtk2 gtksourceview ];
[ SDL libao ]
++ optionals stdenv.isLinux [ openal libpulseaudio udev libX11 libXv libGLU libGL gtk2 gtksourceview ]
++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ]
;
unpackPhase = ''
7z x $src
@ -38,27 +52,36 @@ stdenv.mkDerivation rec {
'';
# Now the cheats file will be distributed separately
installPhase = ''
install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps
install -m 755 icarus/out/icarus $out/bin/
install -m 755 higan/out/higan $out/bin/
install -m 644 higan/data/higan.desktop $out/share/applications/
install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png
install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png
installPhase = (if !stdenv.isDarwin then ''
mkdir -p "$out"/bin "$out"/share/applications "$out"/share/pixmaps
install -m 755 icarus/out/icarus "$out"/bin/
install -m 755 higan/out/higan "$out"/bin/
install -m 644 higan/data/higan.desktop "$out"/share/applications/
install -m 644 higan/data/higan.png "$out"/share/pixmaps/higan-icon.png
install -m 644 higan/resource/logo/higan.png "$out"/share/pixmaps/higan-logo.png
'' else ''
mkdir "$out"
mv higan/out/higan.app "$out"/
mv icarus/out/icarus.app "$out"/
'') + ''
mkdir -p "$out"/share/higan
cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \
higan/systems/* $out/share/higan/
higan/systems/* "$out"/share/higan/
'';
fixupPhase = ''
fixupPhase = let
dest = if !stdenv.isDarwin then "\\$HOME/.local/share/higan" else "\\$HOME/Library/Application Support/higan";
in ''
# A dirty workaround, suggested by @cpages:
# we create a first-run script to populate
# the local $HOME with all the auxiliary
# stuff needed by higan at runtime
mkdir -p "$out"/bin
cat <<EOF > $out/bin/higan-init.sh
#!${runtimeShell}
cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/
cp --recursive --update $out/share/higan/*.sys "${dest}"/
EOF

View file

@ -1,14 +1,17 @@
{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper
, python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama
, libpcap, CoreAudioKit, ForceFeedback
, installShellFiles }:
with stdenv;
let
majorVersion = "0";
minorVersion = "219";
desktopItem = makeDesktopItem {
name = "MAME";
exec = "mame${stdenv.lib.optionalString stdenv.is64bit "64"}";
exec = "mame${lib.optionalString stdenv.is64bit "64"}";
desktopName = "MAME";
genericName = "MAME is a multi-purpose emulation framework";
categories = "System;Emulator;";
@ -27,13 +30,22 @@ in mkDerivation {
};
hardeningDisable = [ "fortify" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ];
makeFlags = [ "TOOLS=1" ];
makeFlags = [
"TOOLS=1"
"USE_LIBSDL=1"
]
++ lib.optionals stdenv.cc.isClang [ "CC=clang" "CXX=clang++" ]
;
dontWrapQtApps = true;
buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ];
buildInputs =
[ SDL2 SDL2_ttf qtbase libXinerama ]
++ lib.optional stdenv.isLinux alsaLib
++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]
;
nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ];
# by default MAME assumes that paths with stock resources
@ -58,16 +70,18 @@ in mkDerivation {
installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6
mv artwork plugins samples ${dest}
'' + lib.optionalString stdenv.isLinux ''
mkdir -p $out/share
ln -s ${desktopItem}/share/applications $out/share
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Is a multi-purpose emulation framework";
homepage = https://www.mamedev.org/;
license = with licenses; [ bsd3 gpl2Plus ];
platforms = [ "x86_64-linux" "i686-linux" ];
platforms = platforms.unix;
# makefile needs fixes for install target
badPlatforms = [ "aarch64-linux" ];
maintainers = with maintainers; [ gnidorah ];
};
}

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "solr";
version = "8.4.1";
version = "8.5.0";
src = fetchurl {
url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz";
sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc";
sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, fuse, pkgconfig }:
stdenv.mkDerivation rec {
version = "1.14.3";
version = "1.14.4";
pname = "bindfs";
src = fetchurl {
url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz";
sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw";
sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7";
};
dontStrip = true;

View file

@ -1,25 +0,0 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "parallel-rust";
version = "0.11.3";
src = fetchFromGitHub {
owner = "mmstick";
repo = "parallel";
rev = version;
sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c";
};
cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n";
patches = [ ./fix_cargo_lock_version.patch ];
meta = with stdenv.lib; {
description = "A command-line CPU load balancer written in Rust";
homepage = https://github.com/mmstick/parallel;
license = licenses.mit;
maintainers = [];
platforms = platforms.all;
};
}

View file

@ -1,12 +0,0 @@
diff --git a/Cargo.lock b/Cargo.lock
index c01308d..dba3927 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
[root]
name = "parallel"
-version = "0.11.2"
+version = "0.11.3"
dependencies = [
"arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns";
};
buildInputs = [ pkgconfig openssl ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ];
cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k";
meta = with stdenv.lib; {

View file

@ -20,8 +20,8 @@ rustPlatform.buildRustPackage {
[ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ]
++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security;
nativeBuildInputs = [ cmake cargo sphinx ];
buildInputs = lib.optional stdenv.isDarwin Security;
# empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults
buildPhase = "";

View file

@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec {
inherit src;
sourceRoot = "source/rust";
cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d";
buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
};
propagatedBuildInputs = with python3Packages; [

View file

@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec {
};
cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w";
buildInputs = [ openssl pkg-config protobuf rdkafka ]
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl protobuf rdkafka ]
++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ];
# needed for internal protobuf c wrapper library

View file

@ -0,0 +1,24 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "bgpq3";
version = "0.1.35";
src = fetchFromGitHub {
owner = "snar";
repo = pname;
rev = "v${version}";
sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj";
};
# Fix binary install location. Remove with next upstream release.
preInstall = "mkdir -p $out/bin";
meta = with stdenv.lib; {
description = "bgp filtering automation tool";
homepage = "https://github.com/snar/bgpq3";
license = licenses.bsd2;
maintainers = with maintainers; [ b4dm4n ];
platforms = with platforms; unix;
};
}

View file

@ -0,0 +1,171 @@
{ stdenv
, fetchurl
, pkgconfig
, file
, glib
# always required runtime dependencies
, dbus
, libmnl
, gnutls
, readline
# configureable options
, firewallType ? "iptables" # or "nftables"
, iptables ? null
, libnftnl ? null # for nftables
, dnsType ? "internal" # or "systemd-resolved"
# optional features which are turned *on* by default
, enableOpenconnect ? true
, openconnect ? null
, enableOpenvpn ? true
, openvpn ? null
, enableVpnc ? true
, vpnc ? true
, enablePolkit ? true
, polkit ? null
, enablePptp ? true
, pptp ? null
, ppp ? null
, enableLoopback ? true
, enableEthernet ? true
, enableWireguard ? true
, enableGadget ? true
, enableWifi ? true
, enableBluetooth ? true
, enableOfono ? true
, enableDundee ? true
, enablePacrunner ? true
, enableNeard ? true
, enableWispr ? true
, enableTools ? true
, enableStats ? true
, enableClient ? true
, enableDatafiles ? true
# optional features which are turned *off* by default
, enableNetworkManager ? false
, enableHh2serialGps ? false
, enableL2tp ? false
, enableIospm ? false
, enableTist ? false
}:
assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ];
assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ];
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec {
pname = "connman";
version = "1.38";
src = fetchurl {
url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b";
};
buildInputs = [
glib
dbus
libmnl
gnutls
readline
];
nativeBuildInputs = [
pkgconfig
file
]
++ optionals (enablePolkit) [ polkit ]
++ optionals (enablePptp) [ pptp ppp ]
++ optionals (firewallType == "iptables") [ iptables ]
++ optionals (firewallType == "nftables") [ libnftnl ]
;
# fix invalid path to 'file'
postPatch = ''
sed -i "s/\/usr\/bin\/file/file/g" ./configure
'';
configureFlags = [
# directories flags
"--sysconfdir=${placeholder "out"}/etc"
"--localstatedir=/var"
"--with-dbusconfdir=${placeholder "out"}/share"
"--with-dbusdatadir=${placeholder "out"}/share"
"--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d"
"--with-systemdunitdir=${placeholder "out"}/lib/systemd/system"
"--with-dns-backend=${dnsType}"
"--with-firewall=${firewallType}"
# production build flags
"--disable-maintainer-mode"
"--enable-session-policy-local=builtin"
# for building and running tests
# "--enable-tests" # installs the tests, we don't want that
"--enable-tools"
]
++ optionals (!enableLoopback) [ "--disable-loopback" ]
++ optionals (!enableEthernet) [ "--disable-ethernet" ]
++ optionals (!enableWireguard) [ "--disable-wireguard" ]
++ optionals (!enableGadget) [ "--disable-gadget" ]
++ optionals (!enableWifi) [ "--disable-wifi" ]
# enable IWD support for wifi as it doesn't require any new dependencies
# and it's easier for the NixOS module to use only one connman package when
# IWD is requested
++ optionals (enableWifi) [ "--enable-iwd" ]
++ optionals (!enableBluetooth) [ "--disable-bluetooth" ]
++ optionals (!enableOfono) [ "--disable-ofono" ]
++ optionals (!enableDundee) [ "--disable-dundee" ]
++ optionals (!enablePacrunner) [ "--disable-pacrunner" ]
++ optionals (!enableNeard) [ "--disable-neard" ]
++ optionals (!enableWispr) [ "--disable-wispr" ]
++ optionals (!enableTools) [ "--disable-tools" ]
++ optionals (!enableStats) [ "--disable-stats" ]
++ optionals (!enableClient) [ "--disable-client" ]
++ optionals (!enableDatafiles) [ "--disable-datafiles" ]
++ optionals (enableOpenconnect) [
"--enable-openconnect=builtin"
"--with-openconnect=${openconnect}/sbin/openconnect"
]
++ optionals (enableOpenvpn) [
"--enable-openvpn=builtin"
"--with-openvpn=${openvpn}/sbin/openvpn"
]
++ optionals (enableVpnc) [
"--enable-vpnc=builtin"
"--with-vpnc=${vpnc}/sbin/vpnc"
]
++ optionals (enablePolkit) [
"--enable-polkit"
]
++ optionals (enablePptp) [
"--enable-pptp"
"--with-pptp=${pptp}/sbin/pptp"
]
++ optionals (!enableWireguard) [
"--disable-wireguard"
]
++ optionals (enableNetworkManager) [
"--enable-nmcompat"
]
++ optionals (enableHh2serialGps) [
"--enable-hh2serial-gps"
]
++ optionals (enableL2tp) [
"--enable-l2tp"
]
++ optionals (enableIospm) [
"--enable-iospm"
]
++ optionals (enableTist) [
"--enable-tist"
]
;
doCheck = true;
meta = with stdenv.lib; {
description = "A daemon for managing internet connections";
homepage = "https://01.org/connman";
maintainers = [ maintainers.matejc ];
platforms = platforms.linux;
license = licenses.gpl2;
};
}

View file

@ -1,61 +1,40 @@
{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk,
openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
wpa_supplicant, readline6, pptp, ppp }:
{ callPackage }:
stdenv.mkDerivation rec {
pname = "connman";
version = "1.37";
src = fetchurl {
url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz";
sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc";
{
# All the defaults
connman = callPackage ./connman.nix { };
connmanFull = callPackage ./connman.nix {
# TODO: Why is this in `connmanFull` and not the default build? See TODO in
# nixos/modules/services/networking/connman.nix (near the assertions)
enableNetworkManager = true;
enableHh2serialGps = true;
enableL2tp = true;
enableIospm = true;
enableTist = true;
};
buildInputs = [ openconnect polkit
openvpn vpnc glib dbus iptables gnutls
wpa_supplicant readline6 pptp ppp ];
nativeBuildInputs = [ pkgconfig file gawk ];
preConfigure = ''
export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
export PPPD=${ppp}/sbin/pppd
export AWK=${gawk}/bin/gawk
sed -i "s/\/usr\/bin\/file/file/g" ./configure
'';
configureFlags = [
"--sysconfdir=\${out}/etc"
"--localstatedir=/var"
"--with-dbusconfdir=${placeholder "out"}/share"
"--with-dbusdatadir=${placeholder "out"}/share"
"--disable-maintainer-mode"
"--enable-openconnect=builtin"
"--with-openconnect=${openconnect}/sbin/openconnect"
"--enable-openvpn=builtin"
"--with-openvpn=${openvpn}/sbin/openvpn"
"--enable-vpnc=builtin"
"--with-vpnc=${vpnc}/sbin/vpnc"
"--enable-session-policy-local=builtin"
"--enable-client"
"--enable-bluetooth"
"--enable-wifi"
"--enable-polkit"
"--enable-tools"
"--enable-datafiles"
"--enable-pptp"
"--with-pptp=${pptp}/sbin/pptp"
"--enable-iwd"
];
postInstall = ''
cp ./client/connmanctl $out/sbin/connmanctl
'';
meta = with stdenv.lib; {
description = "A daemon for managing internet connections";
homepage = https://01.org/connman;
maintainers = [ maintainers.matejc ];
platforms = platforms.linux;
license = licenses.gpl2;
connmanMinimal = callPackage ./connman.nix {
enableOpenconnect = false;
enableOpenvpn = false;
enableVpnc = false;
vpnc = false;
enablePolkit = false;
enablePptp = false;
enableLoopback = false;
# enableEthernet = false; # If disabled no ethernet connection can be performed
enableWireguard = false;
enableGadget = false;
# enableWifi = false; # If disabled no WiFi connection can be performed
enableBluetooth = false;
enableOfono = false;
enableDundee = false;
enablePacrunner = false;
enableNeard = false;
enableWispr = false;
enableTools = false;
enableStats = false;
enableClient = false;
# enableDatafiles = false; # If disabled, configuration and data files are not installed
};
}

View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "findomain";
version = "1.4.2";
version = "1.4.5";
src = fetchFromGitHub {
owner = "Edu4rdSHL";
repo = pname;
rev = version;
sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x";
sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb";
};
cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx";
cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br";
nativeBuildInputs = [ installShellFiles perl ];
buildInputs = lib.optional stdenv.isDarwin Security;

View file

@ -12,10 +12,8 @@ rustPlatform.buildRustPackage rec {
sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
openssl pkgconfig
] ++ lib.optionals stdenv.isDarwin [
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
libiconv darwin.apple_sdk.frameworks.Security
];

View file

@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec {
cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ];
cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1";
nativeBuildInputs = [ cmake ];
buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ]
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libgit2 libssh2 openssl zlib ]
++ stdenv.lib.optional stdenv.isDarwin curl;
meta = with stdenv.lib; {

View file

@ -16,9 +16,9 @@ buildRustPackage rec {
cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig gpgme python3 ];
buildInputs = [
ncurses python3 openssl libgpgerror gpgme xorg.libxcb
ncurses openssl libgpgerror gpgme xorg.libxcb
] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
preFixup = ''

View file

@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
llvmPackages.libclang
llvmPackages.clang
ensureNewerSourcesForZipFilesHook
capnproto
] ++
lib.optionals pythonSupport [ pythonPackages.setuptools ]
;
@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec {
openssl
sqlite
nettle
capnproto
]
++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ]
] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ]
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]
;

View file

@ -46,6 +46,7 @@ mapAliases ({
asciidocFull = asciidoc-full; # added 2014-06-22
at_spi2_atk = at-spi2-atk; # added 2018-02-25
at_spi2_core = at-spi2-core; # added 2018-02-25
avldrums-lv2 = x42-avldrums; # added 2020-03-29
bar-xft = lemonbar-xft; # added 2015-01-16
bashCompletion = bash-completion; # Added 2016-09-28
batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10

View file

@ -718,8 +718,6 @@ in
avfs = callPackage ../tools/filesystems/avfs { };
avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { };
aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {};
awscli = callPackage ../tools/admin/awscli { };
@ -2095,8 +2093,6 @@ in
precice = callPackage ../development/libraries/precice { };
parallel-rust = callPackage ../tools/misc/parallel-rust { };
pueue = callPackage ../applications/misc/pueue { };
pixiecore = callPackage ../tools/networking/pixiecore {};
@ -2499,7 +2495,11 @@ in
conspy = callPackage ../os-specific/linux/conspy {};
connman = callPackage ../tools/networking/connman { };
inherit (callPackage ../tools/networking/connman {})
connman
connmanFull
connmanMinimal
;
connman-gtk = callPackage ../tools/networking/connman/connman-gtk { };
@ -3080,6 +3080,8 @@ in
volctl = callPackage ../tools/audio/volctl { };
vorta = python3Packages.callPackage ../applications/backup/vorta { };
wallutils = callPackage ../tools/graphics/wallutils { };
wev = callPackage ../tools/misc/wev { };
@ -12115,7 +12117,8 @@ in
hwloc = callPackage ../development/libraries/hwloc {};
hydra = callPackage ../development/tools/misc/hydra { };
inherit (callPackage ../development/tools/misc/hydra { })
hydra-migration hydra-unstable hydra-flakes;
hydra-cli = callPackage ../development/tools/misc/hydra-cli { };
@ -17799,6 +17802,8 @@ in
ibm-plex = callPackage ../data/fonts/ibm-plex { };
iconpack-jade = callPackage ../data/icons/iconpack-jade { };
iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
inconsolata = callPackage ../data/fonts/inconsolata {};
@ -18576,6 +18581,8 @@ in
bgpdump = callPackage ../tools/networking/bgpdump { };
bgpq3 = callPackage ../tools/networking/bgpq3 { };
blackbox = callPackage ../applications/version-management/blackbox { };
bleachbit = callPackage ../applications/misc/bleachbit { };
@ -20472,6 +20479,8 @@ in
canonicaljson;
};
matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };
matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {};
mblaze = callPackage ../applications/networking/mailreaders/mblaze { };
@ -22666,6 +22675,8 @@ in
kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; };
kodiGBM = callPackage ../applications/video/kodi { useGbm = true; };
kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
kodi = wrapKodi {
@ -22676,6 +22687,10 @@ in
kodi = kodiPlainWayland;
};
kodi-gbm = wrapKodi {
kodi = kodiGBM;
};
kodi-cli = callPackage ../tools/misc/kodi-cli { };
kodi-retroarch-advanced-launchers =
@ -25301,7 +25316,9 @@ in
icu = icu58;
};
mame = libsForQt5.callPackage ../misc/emulators/mame { };
mame = libsForQt5.callPackage ../misc/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
};
martyr = callPackage ../development/libraries/martyr { };
@ -26080,6 +26097,7 @@ in
higan = callPackage ../misc/emulators/higan {
inherit (gnome2) gtksourceview;
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
};
bullet = callPackage ../development/libraries/bullet {

View file

@ -5854,6 +5854,8 @@ in {
user-agents = callPackage ../development/python-modules/user-agents { };
variants = callPackage ../development/python-modules/variants { };
verboselogs = callPackage ../development/python-modules/verboselogs { };
vega_datasets = callPackage ../development/python-modules/vega_datasets { };