forked from mirrors/nixpkgs
Merge branch 'master' into mono-cleanup
This commit is contained in:
commit
8dba09c181
nixos/modules
pkgs
applications
build-support/rust
desktops/gnome-3/core/adwaita-icon-theme
development
top-level
|
@ -20,7 +20,6 @@ with lib;
|
||||||
KERNEL=="random", TAG+="systemd"
|
KERNEL=="random", TAG+="systemd"
|
||||||
SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
|
SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
|
||||||
KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
|
KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"
|
||||||
${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
systemd.services.rngd = {
|
systemd.services.rngd = {
|
||||||
|
@ -30,8 +29,7 @@ with lib;
|
||||||
|
|
||||||
description = "Hardware RNG Entropy Gatherer Daemon";
|
description = "Hardware RNG Entropy Gatherer Daemon";
|
||||||
|
|
||||||
serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" +
|
serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v";
|
||||||
(if config.services.tcsd.enable then " --no-tpm=1" else "");
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -387,7 +387,7 @@ let
|
||||||
|
|
||||||
logindHandlerType = types.enum [
|
logindHandlerType = types.enum [
|
||||||
"ignore" "poweroff" "reboot" "halt" "kexec" "suspend"
|
"ignore" "poweroff" "reboot" "halt" "kexec" "suspend"
|
||||||
"hibernate" "hybrid-sleep" "lock"
|
"hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock"
|
||||||
];
|
];
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
|
@ -12,7 +12,7 @@ in {
|
||||||
virtualbox = {
|
virtualbox = {
|
||||||
baseImageSize = mkOption {
|
baseImageSize = mkOption {
|
||||||
type = types.int;
|
type = types.int;
|
||||||
default = 10 * 1024;
|
default = 50 * 1024;
|
||||||
description = ''
|
description = ''
|
||||||
The size of the VirtualBox base image in MiB.
|
The size of the VirtualBox base image in MiB.
|
||||||
'';
|
'';
|
||||||
|
@ -61,7 +61,7 @@ in {
|
||||||
export HOME=$PWD
|
export HOME=$PWD
|
||||||
export PATH=${pkgs.virtualbox}/bin:$PATH
|
export PATH=${pkgs.virtualbox}/bin:$PATH
|
||||||
|
|
||||||
echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..."
|
echo "creating VirtualBox pass-through disk wrapper (no copying involved)..."
|
||||||
VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
|
VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage
|
||||||
|
|
||||||
echo "creating VirtualBox VM..."
|
echo "creating VirtualBox VM..."
|
||||||
|
@ -72,9 +72,9 @@ in {
|
||||||
--memory ${toString cfg.memorySize} --acpi on --vram 32 \
|
--memory ${toString cfg.memorySize} --acpi on --vram 32 \
|
||||||
${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
|
${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \
|
||||||
--nictype1 virtio --nic1 nat \
|
--nictype1 virtio --nic1 nat \
|
||||||
--audiocontroller ac97 --audio alsa \
|
--audiocontroller ac97 --audio alsa --audioout on \
|
||||||
--rtcuseutc on \
|
--rtcuseutc on \
|
||||||
--usb on --mouse usbtablet
|
--usb on --usbehci on --mouse usbtablet
|
||||||
VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
|
VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on
|
||||||
VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
|
VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \
|
||||||
--medium disk.vmdk
|
--medium disk.vmdk
|
||||||
|
@ -82,7 +82,7 @@ in {
|
||||||
echo "exporting VirtualBox VM..."
|
echo "exporting VirtualBox VM..."
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
fn="$out/${cfg.vmFileName}"
|
fn="$out/${cfg.vmFileName}"
|
||||||
VBoxManage export "$vmName" --output "$fn"
|
VBoxManage export "$vmName" --output "$fn" --options manifest
|
||||||
|
|
||||||
rm -v $diskImage
|
rm -v $diskImage
|
||||||
|
|
||||||
|
|
|
@ -289,12 +289,12 @@ in
|
||||||
|
|
||||||
idea-community = buildIdea rec {
|
idea-community = buildIdea rec {
|
||||||
name = "idea-community-${version}";
|
name = "idea-community-${version}";
|
||||||
version = "2018.2.4"; /* updated by script */
|
version = "2018.2.5"; /* updated by script */
|
||||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||||
license = stdenv.lib.licenses.asl20;
|
license = stdenv.lib.licenses.asl20;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||||
sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */
|
sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-idea-ce";
|
wmClass = "jetbrains-idea-ce";
|
||||||
update-channel = "IntelliJ IDEA Release";
|
update-channel = "IntelliJ IDEA Release";
|
||||||
|
@ -302,12 +302,12 @@ in
|
||||||
|
|
||||||
idea-ultimate = buildIdea rec {
|
idea-ultimate = buildIdea rec {
|
||||||
name = "idea-ultimate-${version}";
|
name = "idea-ultimate-${version}";
|
||||||
version = "2018.2.4"; /* updated by script */
|
version = "2018.2.5"; /* updated by script */
|
||||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
|
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
|
||||||
sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */
|
sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-idea";
|
wmClass = "jetbrains-idea";
|
||||||
update-channel = "IntelliJ IDEA Release";
|
update-channel = "IntelliJ IDEA Release";
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
{ stdenv, python3, glibcLocales }:
|
{ stdenv, python3, glibcLocales, fetchpatch }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (python3.pkgs) buildPythonApplication fetchPypi;
|
inherit (python3.pkgs) buildPythonApplication fetchPypi;
|
||||||
in
|
in
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
pname = "todoman";
|
pname = "todoman";
|
||||||
version = "3.4.0";
|
version = "3.4.1";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw";
|
sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5";
|
||||||
};
|
};
|
||||||
|
|
||||||
LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
|
LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
|
||||||
|
@ -29,9 +29,17 @@ buildPythonApplication rec {
|
||||||
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
|
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
|
||||||
"--set CHARSET en_us.UTF-8" ];
|
"--set CHARSET en_us.UTF-8" ];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch";
|
||||||
|
sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
preCheck = ''
|
preCheck = ''
|
||||||
# Remove one failing test that only checks whether the command line works
|
# Remove one failing test that only checks whether the command line works
|
||||||
rm tests/test_main.py
|
rm tests/test_main.py
|
||||||
|
rm tests/test_cli.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|
|
@ -6,76 +6,97 @@ let
|
||||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
cairo-rs = attrs: {
|
||||||
|
buildInputs = [ cairo ];
|
||||||
|
};
|
||||||
|
|
||||||
cargo = attrs: {
|
cargo = attrs: {
|
||||||
buildInputs = [ openssl zlib curl ]
|
buildInputs = [ openssl zlib curl ]
|
||||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
|
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ];
|
||||||
# TODO: buildRustCrate seems to use incorrect default inference
|
# TODO: buildRustCrate seems to use incorrect default inference
|
||||||
crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ];
|
crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ];
|
||||||
};
|
};
|
||||||
|
|
||||||
cargo-vendor = attrs: {
|
cargo-vendor = attrs: {
|
||||||
buildInputs = [ openssl zlib curl ];
|
buildInputs = [ openssl zlib curl ];
|
||||||
# TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
|
# TODO: this defaults to cargo_vendor; needs to be cargo-vendor to
|
||||||
# be considered a cargo subcommand.
|
# be considered a cargo subcommand.
|
||||||
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
|
crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
|
||||||
};
|
};
|
||||||
|
|
||||||
curl-sys = attrs: {
|
curl-sys = attrs: {
|
||||||
buildInputs = [ pkgconfig zlib curl ];
|
buildInputs = [ pkgconfig zlib curl ];
|
||||||
propagatedBuildInputs = [ curl zlib ];
|
propagatedBuildInputs = [ curl zlib ];
|
||||||
extraLinkFlags = ["-L${zlib.out}/lib"];
|
extraLinkFlags = ["-L${zlib.out}/lib"];
|
||||||
};
|
};
|
||||||
libgit2-sys = attrs: {
|
|
||||||
LIBGIT2_SYS_USE_PKG_CONFIG = true;
|
|
||||||
buildInputs = [ pkgconfig openssl zlib libgit2 ];
|
|
||||||
};
|
|
||||||
libsqlite3-sys = attrs: {
|
|
||||||
buildInputs = [ pkgconfig sqlite ];
|
|
||||||
};
|
|
||||||
libssh2-sys = attrs: {
|
|
||||||
buildInputs = [ pkgconfig openssl zlib libssh2 ];
|
|
||||||
};
|
|
||||||
openssl = attrs: {
|
|
||||||
buildInputs = [ openssl ];
|
|
||||||
};
|
|
||||||
openssl-sys = attrs: {
|
|
||||||
buildInputs = [ pkgconfig openssl ];
|
|
||||||
};
|
|
||||||
|
|
||||||
dbus = attrs: {
|
dbus = attrs: {
|
||||||
buildInputs = [ pkgconfig dbus ];
|
buildInputs = [ pkgconfig dbus ];
|
||||||
};
|
};
|
||||||
libdbus-sys = attrs: {
|
|
||||||
buildInputs = [ pkgconfig dbus ];
|
|
||||||
};
|
|
||||||
gobject-sys = attrs: {
|
gobject-sys = attrs: {
|
||||||
buildInputs = [ dbus-glib ];
|
buildInputs = [ dbus-glib ];
|
||||||
};
|
};
|
||||||
|
|
||||||
gio-sys = attrs: {
|
gio-sys = attrs: {
|
||||||
buildInputs = [ dbus-glib ];
|
buildInputs = [ dbus-glib ];
|
||||||
};
|
};
|
||||||
|
|
||||||
gdk-pixbuf-sys = attrs: {
|
gdk-pixbuf-sys = attrs: {
|
||||||
buildInputs = [ dbus-glib ];
|
buildInputs = [ dbus-glib ];
|
||||||
};
|
};
|
||||||
|
|
||||||
gdk-pixbuf = attrs: {
|
gdk-pixbuf = attrs: {
|
||||||
buildInputs = [ gdk_pixbuf ];
|
buildInputs = [ gdk_pixbuf ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
libgit2-sys = attrs: {
|
||||||
|
LIBGIT2_SYS_USE_PKG_CONFIG = true;
|
||||||
|
buildInputs = [ pkgconfig openssl zlib libgit2 ];
|
||||||
|
};
|
||||||
|
|
||||||
|
libsqlite3-sys = attrs: {
|
||||||
|
buildInputs = [ pkgconfig sqlite ];
|
||||||
|
};
|
||||||
|
|
||||||
|
libssh2-sys = attrs: {
|
||||||
|
buildInputs = [ pkgconfig openssl zlib libssh2 ];
|
||||||
|
};
|
||||||
|
|
||||||
|
libdbus-sys = attrs: {
|
||||||
|
buildInputs = [ pkgconfig dbus ];
|
||||||
|
};
|
||||||
|
|
||||||
|
openssl = attrs: {
|
||||||
|
buildInputs = [ openssl ];
|
||||||
|
};
|
||||||
|
|
||||||
|
openssl-sys = attrs: {
|
||||||
|
buildInputs = [ pkgconfig openssl ];
|
||||||
|
};
|
||||||
|
|
||||||
|
pq-sys = attr: {
|
||||||
|
buildInputs = [ pkgconfig postgresql ];
|
||||||
|
};
|
||||||
|
|
||||||
rink = attrs: {
|
rink = attrs: {
|
||||||
buildInputs = [ gmp ];
|
buildInputs = [ gmp ];
|
||||||
crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ];
|
crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ];
|
||||||
};
|
};
|
||||||
cairo-rs = attrs: {
|
|
||||||
buildInputs = [ cairo ];
|
security-framework-sys = attr: {
|
||||||
|
propagatedBuildInputs = [ Security ];
|
||||||
};
|
};
|
||||||
xcb = attrs: {
|
|
||||||
buildInputs = [ python3 ];
|
serde_derive = attrs: {
|
||||||
|
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
|
||||||
};
|
};
|
||||||
|
|
||||||
thrussh-libsodium = attrs: {
|
thrussh-libsodium = attrs: {
|
||||||
buildInputs = [ pkgconfig libsodium ];
|
buildInputs = [ pkgconfig libsodium ];
|
||||||
};
|
};
|
||||||
pq-sys = attr: {
|
|
||||||
buildInputs = [ pkgconfig postgresql ];
|
xcb = attrs: {
|
||||||
};
|
buildInputs = [ python3 ];
|
||||||
security-framework-sys = attr: {
|
|
||||||
propagatedBuildInputs = [ Security ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "adwaita-icon-theme-${version}";
|
name = "adwaita-icon-theme-${version}";
|
||||||
version = "3.28.0";
|
version = "3.30.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
||||||
sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks";
|
sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li";
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
{ callPackage, Foundation, libobjc }:
|
|
||||||
|
|
||||||
callPackage ./generic.nix (rec {
|
|
||||||
inherit Foundation libobjc;
|
|
||||||
version = "4.4.2.11";
|
|
||||||
sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h";
|
|
||||||
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737
|
|
||||||
})
|
|
|
@ -7,12 +7,12 @@
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "3.9.0";
|
version = "4.0.3";
|
||||||
pname = "icalendar";
|
pname = "icalendar";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792";
|
sha256 = "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ setuptools ];
|
buildInputs = [ setuptools ];
|
||||||
|
|
|
@ -7243,11 +7243,6 @@ with pkgs;
|
||||||
mono5 = mono58;
|
mono5 = mono58;
|
||||||
mono4 = mono48;
|
mono4 = mono48;
|
||||||
|
|
||||||
mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix {
|
|
||||||
inherit (darwin) libobjc;
|
|
||||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
|
||||||
});
|
|
||||||
|
|
||||||
mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix {
|
mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix {
|
||||||
inherit (darwin) libobjc;
|
inherit (darwin) libobjc;
|
||||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||||
|
|
Loading…
Reference in a new issue