mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge remote-tracking branch 'upstream/master' into HEAD
This commit is contained in:
Frederik Rietdijk
commit
6b0873440b
67 changed files with 461 additions and 246 deletions
|
|
@ -118,6 +118,7 @@
|
|||
chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
|
||||
chattered = "Phil Scott <me@philscotted.com>";
|
||||
ChengCat = "Yucheng Zhang <yu@cheng.cat>";
|
||||
chiiruno = "Okina Matara <okinan@protonmail.com>";
|
||||
choochootrain = "Hurshal Patel <hurshal@imap.cc>";
|
||||
chpatrick = "Patrick Chilton <chpatrick@gmail.com>";
|
||||
chreekat = "Bryan Richter <b@chreekat.net>";
|
||||
|
|
@ -485,6 +486,7 @@
|
|||
nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
|
||||
NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
|
||||
nixy = "Andrew R. M. <nixy@nixy.moe>";
|
||||
nmattia = "Nicolas Mattia <nicolas@nmattia.com>";
|
||||
nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
|
||||
notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
|
||||
np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@
|
|||
version="5.0"
|
||||
xml:id="sec-instaling-virtualbox-guest">
|
||||
|
||||
<title>Installing in a Virtualbox guest</title>
|
||||
<title>Installing in a VirtualBox guest</title>
|
||||
<para>
|
||||
Installing NixOS into a Virtualbox guest is convenient for users who want to
|
||||
Installing NixOS into a VirtualBox guest is convenient for users who want to
|
||||
try NixOS without installing it on bare metal. If you want to use a pre-made
|
||||
Virtualbox appliance, it is available at <link
|
||||
VirtualBox appliance, it is available at <link
|
||||
xlink:href="https://nixos.org/nixos/download.html">the downloads page</link>.
|
||||
If you want to set up a Virtualbox guest manually, follow these instructions:
|
||||
If you want to set up a VirtualBox guest manually, follow these instructions:
|
||||
</para>
|
||||
|
||||
<orderedlist>
|
||||
|
||||
<listitem><para>Add a New Machine in Virtualbox with OS Type "Linux / Other
|
||||
<listitem><para>Add a New Machine in VirtualBox with OS Type "Linux / Other
|
||||
Linux"</para></listitem>
|
||||
|
||||
<listitem><para>Base Memory Size: 768 MB or higher.</para></listitem>
|
||||
|
|
|
|||
|
|
@ -45,7 +45,10 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif
|
|||
using <command>ifconfig</command>.</para>
|
||||
<para>To manually configure the network on the graphical installer,
|
||||
first disable network-manager with
|
||||
<command>systemctl stop network-manager</command>.</para></listitem>
|
||||
<command>systemctl stop network-manager</command>.</para>
|
||||
<para>To manually configure the wifi on the minimal installer, run
|
||||
<command>wpa_supplicant -B -i interface -c <(wpa_passphrase 'SSID' 'key')</command>.</para></listitem>
|
||||
|
||||
|
||||
<listitem><para>If you would like to continue the installation from a different
|
||||
machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
|
||||
|
|
|
|||
|
|
@ -13,10 +13,16 @@
|
|||
# grafted in the file system at path `target'.
|
||||
, contents ? []
|
||||
|
||||
, # Whether the disk should be partitioned (with a single partition
|
||||
# containing the root filesystem) or contain the root filesystem
|
||||
# directly.
|
||||
partitioned ? true
|
||||
, # Type of partition table to use; either "legacy", "efi", or "none".
|
||||
# For "efi" images, the GPT partition table is used and a mandatory ESP
|
||||
# partition of reasonable size is created in addition to the root partition.
|
||||
# If `installBootLoader` is true, GRUB will be installed in EFI mode.
|
||||
# For "legacy", the msdos partition table is used and a single large root
|
||||
# partition is created. If `installBootLoader` is true, GRUB will be
|
||||
# installed in legacy mode.
|
||||
# For "none", no partition table is created. Enabling `installBootLoader`
|
||||
# most likely fails as GRUB will probably refuse to install.
|
||||
partitionTableType ? "legacy"
|
||||
|
||||
# Whether to invoke switch-to-configuration boot during image creation
|
||||
, installBootLoader ? true
|
||||
|
|
@ -37,6 +43,10 @@
|
|||
format ? "raw"
|
||||
}:
|
||||
|
||||
assert partitionTableType == "legacy" || partitionTableType == "efi" || partitionTableType == "none";
|
||||
# We use -E offset=X below, which is only supported by e2fsprogs
|
||||
assert partitionTableType != "none" -> fsType == "ext4";
|
||||
|
||||
with lib;
|
||||
|
||||
let format' = format; in let
|
||||
|
|
@ -51,6 +61,27 @@ let format' = format; in let
|
|||
raw = "img";
|
||||
}.${format};
|
||||
|
||||
rootPartition = { # switch-case
|
||||
legacy = "1";
|
||||
efi = "2";
|
||||
}.${partitionTableType};
|
||||
|
||||
partitionDiskScript = { # switch-case
|
||||
legacy = ''
|
||||
parted --script $diskImage -- \
|
||||
mklabel msdos \
|
||||
mkpart primary ext4 1MiB -1
|
||||
'';
|
||||
efi = ''
|
||||
parted --script $diskImage -- \
|
||||
mklabel gpt \
|
||||
mkpart ESP fat32 8MiB 256MiB \
|
||||
set 1 boot on \
|
||||
mkpart primary ext4 256MiB -1
|
||||
'';
|
||||
none = "";
|
||||
}.${partitionTableType};
|
||||
|
||||
nixpkgs = cleanSource pkgs.path;
|
||||
|
||||
channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
|
||||
|
|
@ -79,20 +110,31 @@ let format' = format; in let
|
|||
targets = map (x: x.target) contents;
|
||||
|
||||
prepareImage = ''
|
||||
export PATH=${makeSearchPathOutput "bin" "bin" prepareImageInputs}
|
||||
export PATH=${makeBinPath prepareImageInputs}
|
||||
|
||||
# Yes, mkfs.ext4 takes different units in different contexts. Fun.
|
||||
sectorsToKilobytes() {
|
||||
echo $(( ( "$1" * 512 ) / 1024 ))
|
||||
}
|
||||
|
||||
sectorsToBytes() {
|
||||
echo $(( "$1" * 512 ))
|
||||
}
|
||||
|
||||
mkdir $out
|
||||
diskImage=nixos.raw
|
||||
truncate -s ${toString diskSize}M $diskImage
|
||||
|
||||
${if partitioned then ''
|
||||
parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
|
||||
offset=$((2048*512))
|
||||
'' else ''
|
||||
offset=0
|
||||
''}
|
||||
${partitionDiskScript}
|
||||
|
||||
mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
|
||||
${if partitionTableType != "none" then ''
|
||||
# Get start & length of the root partition in sectors to $START and $SECTORS.
|
||||
eval $(partx $diskImage -o START,SECTORS --nr ${rootPartition} --pairs)
|
||||
|
||||
mkfs.${fsType} -F -L nixos $diskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K
|
||||
'' else ''
|
||||
mkfs.${fsType} -F -L nixos $diskImage
|
||||
''}
|
||||
|
||||
root="$PWD/root"
|
||||
mkdir -p $root
|
||||
|
|
@ -133,12 +175,12 @@ let format' = format; in let
|
|||
find $root/nix/store -mindepth 1 -maxdepth 1 -type f -o -type d | xargs chmod -R a-w
|
||||
|
||||
echo "copying staging root to image..."
|
||||
cptofs ${optionalString partitioned "-P 1"} -t ${fsType} -i $diskImage $root/* /
|
||||
cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* /
|
||||
'';
|
||||
in pkgs.vmTools.runInLinuxVM (
|
||||
pkgs.runCommand name
|
||||
{ preVM = prepareImage;
|
||||
buildInputs = with pkgs; [ utillinux e2fsprogs ];
|
||||
buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ];
|
||||
exportReferencesGraph = [ "closure" metaClosure ];
|
||||
postVM = ''
|
||||
${if format == "raw" then ''
|
||||
|
|
@ -152,11 +194,7 @@ in pkgs.vmTools.runInLinuxVM (
|
|||
memSize = 1024;
|
||||
}
|
||||
''
|
||||
${if partitioned then ''
|
||||
rootDisk=/dev/vda1
|
||||
'' else ''
|
||||
rootDisk=/dev/vda
|
||||
''}
|
||||
rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"}
|
||||
|
||||
# Some tools assume these exist
|
||||
ln -s vda /dev/xvda
|
||||
|
|
@ -166,6 +204,14 @@ in pkgs.vmTools.runInLinuxVM (
|
|||
mkdir $mountPoint
|
||||
mount $rootDisk $mountPoint
|
||||
|
||||
# Create the ESP and mount it. Unlike e2fsprogs, mkfs.vfat doesn't support an
|
||||
# '-E offset=X' option, so we can't do this outside the VM.
|
||||
${optionalString (partitionTableType == "efi") ''
|
||||
mkdir -p /mnt/boot
|
||||
mkfs.vfat -n ESP /dev/vda1
|
||||
mount /dev/vda1 /mnt/boot
|
||||
''}
|
||||
|
||||
# Install a configuration.nix
|
||||
mkdir -p /mnt/etc/nixos
|
||||
${optionalString (configFile != null) ''
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ in {
|
|||
inherit lib config;
|
||||
inherit (cfg) contents format name;
|
||||
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
|
||||
partitioned = config.ec2.hvm;
|
||||
partitionTableType = if config.ec2.hvm then "legacy" else "none";
|
||||
diskSize = cfg.sizeMB;
|
||||
configFile = pkgs.writeText "configuration.nix"
|
||||
''
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ in
|
|||
default = {};
|
||||
description = ''
|
||||
A set of environment variables used in the global environment.
|
||||
These variables will be set on shell initialisation.
|
||||
These variables will be set on shell initialisation (e.g. in /etc/profile).
|
||||
The value of each variable can be either a string or a list of
|
||||
strings. The latter is concatenated, interspersed with colon
|
||||
characters.
|
||||
|
|
|
|||
|
|
@ -36,8 +36,9 @@ in
|
|||
shellAliases = mkOption {
|
||||
default = config.environment.shellAliases;
|
||||
description = ''
|
||||
Set of aliases for zsh shell. See <option>environment.shellAliases</option>
|
||||
for an option format description.
|
||||
Set of aliases for zsh shell. Overrides the default value taken from
|
||||
<option>environment.shellAliases</option>.
|
||||
See <option>environment.shellAliases</option> for an option format description.
|
||||
'';
|
||||
type = types.attrs; # types.attrsOf types.stringOrPath;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -40,6 +40,10 @@ in
|
|||
kernel documentation</link>. Otherwise, if
|
||||
<option>networking.useDHCP</option> is enabled, an IP address
|
||||
is acquired using DHCP.
|
||||
|
||||
You should add the module(s) required for your network card to
|
||||
boot.initrd.availableKernelModules. lspci -v -s <ethernet controller>
|
||||
will tell you which.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -208,10 +208,11 @@ in
|
|||
"usbhid"
|
||||
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" "hid_logitech_hidpp"
|
||||
|
||||
# Misc. keyboard stuff.
|
||||
] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
|
||||
# Misc. x86 keyboard stuff.
|
||||
"pcips2" "atkbd" "i8042"
|
||||
|
||||
# Needed by the stage 2 init script.
|
||||
# x86 RTC needed by the stage 2 init script.
|
||||
"rtc_cmos"
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ in {
|
|||
dmidecode
|
||||
dnsmasq
|
||||
ebtables
|
||||
cfg.qemuPackage # libvirtd requires qemu-img to manage disk images
|
||||
]
|
||||
++ optional vswitch.enable vswitch.package;
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ in {
|
|||
name = "nixos-ova-${config.system.nixosLabel}-${pkgs.stdenv.system}";
|
||||
|
||||
inherit pkgs lib config;
|
||||
partitioned = true;
|
||||
partitionTableType = "legacy";
|
||||
diskSize = cfg.baseImageSize;
|
||||
|
||||
postVM =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, vlc
|
||||
, qtbase, qtmultimedia, qtsvg, qttools
|
||||
|
||||
# Cantata doesn't build with cdparanoia enabled so we disable that
|
||||
|
|
@ -45,6 +45,15 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch";
|
||||
sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj";
|
||||
name = "fix_qt_510.patch";
|
||||
})
|
||||
|
||||
];
|
||||
buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
|
||||
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
|
||||
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
|
||||
|
|
|
|||
|
|
@ -234,12 +234,12 @@ in
|
|||
|
||||
clion = buildClion rec {
|
||||
name = "clion-${version}";
|
||||
version = "2017.3.1"; /* updated by script */
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||
sha256 = "19pb78s5pa5ywifi1azs8gpg0a65c9n3yiqng348a7s27azkw01z"; /* updated by script */
|
||||
sha256 = "0lv0nwfgm6h67mxhh0a2154ym7wcbm1qp3k1k1i00lg0lwig1rcw"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-clion";
|
||||
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||
|
|
@ -260,12 +260,12 @@ in
|
|||
|
||||
goland = buildGoland rec {
|
||||
name = "goland-${version}";
|
||||
version = "2017.3"; /* updated by script */
|
||||
version = "2017.3.1"; /* updated by script */
|
||||
description = "Up and Coming Go IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||
sha256 = "0l4l0lsmq1g4fwfrxhbrnfsp8nk38ml48cryvdr241zsxz43fax0"; /* updated by script */
|
||||
sha256 = "0cfjfv01ra67sr8n8ijqwd9zm2yzb1nm447kf0mr5cynr124ch0z"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-goland";
|
||||
update-channel = "goland_release";
|
||||
|
|
@ -273,12 +273,12 @@ in
|
|||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2017.3.2";
|
||||
version = "2017.3.3"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "70cc4f36a6517c7af980456758214414ea74c5c4f314ecf30dd2640600badd62"; /* updated by script */
|
||||
sha256 = "1wxaz25609wri2d91s9wy00gngplyjg7gzix3mzdhgysm00qizf1"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
update-channel = "IDEA_Release";
|
||||
|
|
@ -286,12 +286,12 @@ in
|
|||
|
||||
idea-ultimate = buildIdea rec {
|
||||
name = "idea-ultimate-${version}";
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
version = "2017.3.3"; /* updated by script */
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
|
||||
sha256 = "0lygnhn2wbs1678g3jbd3c5yzxnjp106qx7v9kgvb1k6l9mqb3my"; /* updated by script */
|
||||
sha256 = "01d5a6m927q9bnjlpz8va8bfjnj52k8q6i3im5ygj6lwadbzawyf"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-idea";
|
||||
update-channel = "IDEA_Release";
|
||||
|
|
@ -299,12 +299,12 @@ in
|
|||
|
||||
phpstorm = buildPhpStorm rec {
|
||||
name = "phpstorm-${version}";
|
||||
version = "2017.3.2";
|
||||
version = "2017.3.3"; /* updated by script */
|
||||
description = "Professional IDE for Web and PHP developers";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||
sha256 = "1grkqvj4j33d8hmy11ipkcci20sw7jpnc5zl28a9g85f2pzvsvs0";
|
||||
sha256 = "0mk4d2c41qvfz7sqxqw7adak86pm95wvhzxrfg32y01r5i5q0av7"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-phpstorm";
|
||||
update-channel = "PS2017.3";
|
||||
|
|
@ -312,12 +312,12 @@ in
|
|||
|
||||
pycharm-community = buildPycharm rec {
|
||||
name = "pycharm-community-${version}";
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
version = "2017.3.3"; /* updated by script */
|
||||
description = "PyCharm Community Edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "1xp4hva2wj2r3haqwmji4vpg6xm9fsx2xihslwmq89vfrbzybyq6"; /* updated by script */
|
||||
sha256 = "1j9pp8lfy62d9l3953d5mpij60s6sqyv3bcjimgy85hsrw570x3r"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm-ce";
|
||||
update-channel = "PyCharm_Release";
|
||||
|
|
@ -325,12 +325,12 @@ in
|
|||
|
||||
pycharm-professional = buildPycharm rec {
|
||||
name = "pycharm-professional-${version}";
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
version = "2017.3.3"; /* updated by script */
|
||||
description = "PyCharm Professional Edition";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||
sha256 = "0bqavq9f9pg82yh04bpzpb3a36980v2bn70j1ch6gsm3hdd75swv"; /* updated by script */
|
||||
sha256 = "180cwva49air4j7g409algrm4svvmcbapspf9als3djhazqmczgr"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-pycharm";
|
||||
update-channel = "PyCharm_Release";
|
||||
|
|
@ -351,12 +351,12 @@ in
|
|||
|
||||
ruby-mine = buildRubyMine rec {
|
||||
name = "ruby-mine-${version}";
|
||||
version = "2017.3.1"; /* updated by script */
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
description = "The Most Intelligent Ruby and Rails IDE";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
|
||||
sha256 = "01y89blg30y41j2h254mhf7b7d7nd3bgscinn03vpkjfg7hzr689"; /* updated by script */
|
||||
sha256 = "1dc14k7i0nfhkzi0j53hysqzxcls29j487jr9kv1aqp81k544bdy"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-rubymine";
|
||||
update-channel = "rm2017.3";
|
||||
|
|
@ -364,12 +364,12 @@ in
|
|||
|
||||
webstorm = buildWebStorm rec {
|
||||
name = "webstorm-${version}";
|
||||
version = "2017.3.2"; /* updated by script */
|
||||
version = "2017.3.3"; /* updated by script */
|
||||
description = "Professional IDE for Web and JavaScript development";
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
|
||||
sha256 = "1if99qjpnf9x7d3f1anpiglg9lwc3phamfd4wbyi9yjnk3rf5qcr"; /* updated by script */
|
||||
sha256 = "1fhs13944928rqcqbv8d29qm1y0zzry4drr9gqqmj814y2vkbpnl"; /* updated by script */
|
||||
};
|
||||
wmClass = "jetbrains-webstorm";
|
||||
update-channel = "WS_Release";
|
||||
|
|
|
|||
|
|
@ -39,13 +39,13 @@ let
|
|||
|
||||
neovim = stdenv.mkDerivation rec {
|
||||
name = "neovim-unwrapped-${version}";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "neovim";
|
||||
rev = "v${version}";
|
||||
sha256 = "19ppj0i59kk70j09gap6azm0jm4y95fr5fx7n9gx377y3xjs8h03";
|
||||
sha256 = "1dxr29d0hyag7snbww5s40as90412qb61rgj7gd9rps1iccl9gv4";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
msgpack (1.1.0)
|
||||
multi_json (1.12.2)
|
||||
neovim (0.6.1)
|
||||
msgpack (1.2.2)
|
||||
multi_json (1.13.1)
|
||||
neovim (0.6.2)
|
||||
msgpack (~> 1.0)
|
||||
multi_json (~> 1.0)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,26 +2,26 @@
|
|||
msgpack = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7";
|
||||
sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.2";
|
||||
};
|
||||
multi_json = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
|
||||
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.2";
|
||||
version = "1.13.1";
|
||||
};
|
||||
neovim = {
|
||||
dependencies = ["msgpack" "multi_json"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dnv2pdl8lwwy4av8bqc6kdlgxw88dmajm4fkdk6hc7qdx1sw234";
|
||||
sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dbeaver-ce-${version}";
|
||||
version = "4.3.2";
|
||||
version = "4.3.3";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "dbeaver";
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "0spiwx5dxchpl2qq10rinj9db723w2hf7inqmg4m7fjaj75bpl3s";
|
||||
sha256 = "063h2za2m33b4k9s756lwicxwszzsqr2sqr2gi4ai05dqkgkw951";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -1,34 +1,39 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch
|
||||
, pkgconfig, which, perl, gtk2, xrandr
|
||||
, cairo, dbus, gdk_pixbuf, glib, libX11, libXScrnSaver
|
||||
, pkgconfig, which, perl, libXrandr
|
||||
, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
|
||||
, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dunst-${version}";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
rev = "v${version}";
|
||||
sha256 = "0jncnb4z4hg92ws08bkf52jswsd4vqlzyznwbynhh2jh6q0sl18b";
|
||||
sha256 = "1085v4193yfj8ksngp4mk5n0nwzr3s5y3cs3c74ymaldfl20x91k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkgconfig which ];
|
||||
nativeBuildInputs = [ perl pkgconfig which systemd ];
|
||||
|
||||
buildInputs = [
|
||||
cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
|
||||
libXinerama libnotify libxdg_basedir pango xproto librsvg gtk2 xrandr
|
||||
libXinerama libnotify libxdg_basedir pango xproto librsvg libXrandr
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
"VERSION=$(version)"
|
||||
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
|
||||
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight and customizable notification daemon";
|
||||
homepage = http://www.knopwob.org/dunst/;
|
||||
homepage = https://dunst-project.org/;
|
||||
license = licenses.bsd3;
|
||||
# NOTE: 'unix' or even 'all' COULD work too, I'm not sure
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tint2-${version}";
|
||||
version = "16.1";
|
||||
version = "16.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "o9000";
|
||||
repo = "tint2";
|
||||
rev = version;
|
||||
sha256 = "0qhp1i24b03g15393lf8jd2ykznh6kvwvf7k7yqdb99zv5i8r75z";
|
||||
sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -50,6 +50,6 @@ mkChromiumDerivation (base: rec {
|
|||
maintainers = with maintainers; [ chaoflow bendlas ];
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
|
||||
hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
|
||||
};
|
||||
})
|
||||
|
|
|
|||
|
|
@ -201,6 +201,9 @@ let
|
|||
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
||||
-delete
|
||||
done
|
||||
'' + optionalString stdenv.isAarch64 ''
|
||||
substituteInPlace build/toolchain/linux/BUILD.gn \
|
||||
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
|
||||
'';
|
||||
|
||||
gnFlags = mkGnFlags ({
|
||||
|
|
|
|||
|
|
@ -117,13 +117,19 @@ in stdenv.mkDerivation {
|
|||
ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
|
||||
|
||||
mkdir -p "$out/share/applications"
|
||||
for f in '${chromium.browser}'/share/*; do
|
||||
for f in '${chromium.browser}'/share/*; do # hello emacs */
|
||||
ln -s -t "$out/share/" "$f"
|
||||
done
|
||||
cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
|
||||
'';
|
||||
|
||||
inherit (chromium.browser) meta packageName;
|
||||
inherit (chromium.browser) packageName;
|
||||
meta = chromium.browser.meta // {
|
||||
broken = if enableWideVine then
|
||||
builtins.trace "WARNING: WideVine is not functional, please only use for testing"
|
||||
true
|
||||
else false;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
inherit (chromium) upstream-info browser;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ stdenv
|
||||
, jshon
|
||||
, glib
|
||||
, nspr
|
||||
, nss
|
||||
, fetchzip
|
||||
, patchelfUnstable
|
||||
, enablePepperFlash ? false
|
||||
, enableWideVine ? false
|
||||
|
||||
|
|
@ -45,6 +49,8 @@ let
|
|||
|
||||
src = upstream-info.binary;
|
||||
|
||||
nativeBuildInputs = [ patchelfUnstable ];
|
||||
|
||||
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
|
||||
|
||||
unpackCmd = let
|
||||
|
|
@ -63,14 +69,12 @@ let
|
|||
! find -iname '*.so' -exec ldd {} + | grep 'not found'
|
||||
'';
|
||||
|
||||
patchPhase = ''
|
||||
for sofile in libwidevinecdm.so libwidevinecdmadapter.so; do
|
||||
chmod +x "$sofile"
|
||||
patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" "$sofile"
|
||||
done
|
||||
PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ];
|
||||
|
||||
patchelf --set-rpath "$out/lib:${mkrpath [ stdenv.cc.cc ]}" \
|
||||
libwidevinecdmadapter.so
|
||||
patchPhase = ''
|
||||
chmod +x libwidevinecdm.so libwidevinecdmadapter.so
|
||||
patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so
|
||||
patchelf --set-rpath "$out/lib:$PATCH_RPATH" libwidevinecdmadapter.so
|
||||
'';
|
||||
|
||||
installPhase = let
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
|
||||
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, makeWrapper }:
|
||||
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "newsboat-${version}";
|
||||
|
|
@ -12,16 +12,24 @@ stdenv.mkDerivation rec {
|
|||
|
||||
prePatch = ''
|
||||
substituteInPlace Makefile --replace "|| true" ""
|
||||
# Allow other ncurses versions on Darwin
|
||||
substituteInPlace config.sh \
|
||||
--replace "ncurses5.4" "ncurses"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin makeWrapper;
|
||||
++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
|
||||
|
||||
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "prefix=" ];
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
postInstall = ''
|
||||
cp -r contrib $out
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
|
||||
done
|
||||
|
|
@ -30,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
homepage = https://newsboat.org/;
|
||||
description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console.";
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
maintainers = with maintainers; [ dotlambda nicknovitski ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,29 +4,6 @@
|
|||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
# TODO: Not sure if all these overwrites are really required...
|
||||
# Upstream seems to have some reasons (bugs, incompatibilities) though.
|
||||
multidict_3_1_3 =
|
||||
(stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
|
||||
rec {
|
||||
pname = "multidict";
|
||||
version = "3.1.3";
|
||||
name = "${pname}-${version}";
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
|
||||
};
|
||||
doInstallCheck = false;
|
||||
}));
|
||||
yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl
|
||||
(oldAttrs:
|
||||
{ propagatedBuildInputs = [ multidict_3_1_3 pythonPackages.idna ]; }));
|
||||
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
|
||||
(oldAttrs:
|
||||
rec {
|
||||
propagatedBuildInputs = [ yarl multidict_3_1_3 ]
|
||||
++ (with pythonPackages; [ async-timeout chardet ]);
|
||||
}));
|
||||
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
|
||||
(oldAttrs:
|
||||
rec {
|
||||
|
|
@ -37,7 +14,6 @@ let
|
|||
inherit pname version;
|
||||
sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
|
||||
};
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
}));
|
||||
in pythonPackages.buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -50,16 +26,13 @@ in pythonPackages.buildPythonPackage rec {
|
|||
sha256 = sha256Hash;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ]
|
||||
propagatedBuildInputs = [ aiohttp-cors ]
|
||||
++ (with pythonPackages; [
|
||||
yarl aiohttp multidict
|
||||
jinja2 psutil zipstream raven jsonschema typing
|
||||
prompt_toolkit
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt
|
||||
'';
|
||||
|
||||
# Requires network access
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,36 +1,42 @@
|
|||
{ mkDerivation, lib, fetchgit, pkgconfig, gyp, cmake
|
||||
, qtbase, qtimageformats
|
||||
, gtk3, libappindicator-gtk3, dee
|
||||
, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio
|
||||
, gcc
|
||||
{ mkDerivation, lib, fetchgit, fetchpatch
|
||||
, pkgconfig, gyp, cmake, gcc7
|
||||
, qtbase, qtimageformats, gtk3, libappindicator-gtk3
|
||||
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
name = "telegram-desktop-${version}";
|
||||
version = "1.1.23";
|
||||
version = "1.2.6";
|
||||
|
||||
# Submodules
|
||||
src = fetchgit {
|
||||
url = "git://github.com/telegramdesktop/tdesktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "0pdjrypjg015zvg8iydrja8kzvq0jsi1wz77r2cxvyyb4rkgyv7x";
|
||||
sha256 = "15g0m2wwqfp13wd7j31p8cx1kpylx5m8ljaksnsqdkgyr9l1ar8w";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# TODO: Not active anymore.
|
||||
tgaur = fetchgit {
|
||||
url = "https://aur.archlinux.org/telegram-desktop-systemqt.git";
|
||||
rev = "885d0594d8dfa0a17c14140579a3d27ef2b9bdd0";
|
||||
sha256 = "0cdci8d8j3czhznp7gqn16w32j428njmzxr34pdsv40gggh0lbpn";
|
||||
rev = "1ed27ce40913b9e6e87faf7a2310660c2790b98e";
|
||||
sha256 = "1i7ipqgisaw54g1nbg2cvpbx89g9gyjjb3sak1486pxsasp1qhyc";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
|
||||
libopus alsaLib libpulseaudio
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "tdesktop.patch";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/repos/community-x86_64/tdesktop.patch?h=packages/telegram-desktop&id=f0eefac36f529295f8b065a14b6d5f1a51d7614d";
|
||||
sha256 = "1a4wap5xnp6zn4913r3zdpy6hvkcfxcy4zzimy7fwzp7iwy20iqa";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gyp cmake gcc ];
|
||||
nativeBuildInputs = [ pkgconfig gyp cmake gcc7 ];
|
||||
|
||||
patches = [ "${tgaur}/tdesktop.patch" ];
|
||||
buildInputs = [
|
||||
qtbase qtimageformats gtk3 libappindicator-gtk3
|
||||
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -54,7 +60,7 @@ mkDerivation rec {
|
|||
"-I${libopus.dev}/include/opus"
|
||||
"-I${alsaLib.dev}/include/alsa"
|
||||
"-I${libpulseaudio.dev}/include/pulse"
|
||||
]) [ "QtCore" "QtGui" ];
|
||||
]) [ "QtCore" "QtGui" "QtDBus" ];
|
||||
CPPFLAGS = NIX_CFLAGS_COMPILE;
|
||||
|
||||
preConfigure = ''
|
||||
|
|
@ -69,6 +75,9 @@ mkDerivation rec {
|
|||
-e 's,-flto,,g'
|
||||
|
||||
sed -i Telegram/gyp/qt.gypi \
|
||||
-e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
|
||||
-e 's,\d+",\d+" | head -n1,g'
|
||||
sed -i Telegram/gyp/qt_moc.gypi \
|
||||
-e "s,/usr/bin/moc,moc,g"
|
||||
sed -i Telegram/gyp/qt_rcc.gypi \
|
||||
-e "s,/usr/bin/rcc,rcc,g"
|
||||
|
|
@ -105,6 +114,6 @@ mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
homepage = https://desktop.telegram.org/;
|
||||
maintainers = with maintainers; [ abbradar garbas ];
|
||||
maintainers = with maintainers; [ abbradar garbas primeos ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
directly through the Git command line.
|
||||
'';
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.16.0";
|
||||
version = "2.16.1";
|
||||
svn = subversionClient.override { perlBindings = true; };
|
||||
in
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
|
||||
sha256 = "1y1hdr8ydff5q7y762cwfdgaxam4mxvir6nrw3g51mmkcr77c40d";
|
||||
sha256 = "06gay8k29glg4giwphjalcc1fknxw4bmxkmbr3ic3gzxy8vl7bfg";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ pkgs
|
||||
, kernel ? pkgs.linux
|
||||
, img ? "bzImage"
|
||||
, img ? pkgs.stdenv.platform.kernelTarget
|
||||
, storeDir ? builtins.storeDir
|
||||
, rootModules ?
|
||||
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ]
|
||||
[ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" ]
|
||||
++ pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"
|
||||
}:
|
||||
|
||||
with pkgs;
|
||||
|
|
|
|||
|
|
@ -174,6 +174,7 @@ in mkDerivation (rec {
|
|||
isGhcjs = true;
|
||||
inherit nodejs ghcjsBoot;
|
||||
socket-io = pkgs.nodePackages."socket.io";
|
||||
haskellCompilerName = "ghcjs";
|
||||
|
||||
# let us assume ghcjs is never actually cross compiled
|
||||
targetPrefix = "";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ bootPkgs }:
|
||||
{ bootPkgs, cabal-install }:
|
||||
|
||||
bootPkgs.callPackage ./base.nix {
|
||||
inherit bootPkgs;
|
||||
inherit bootPkgs cabal-install;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ fetchgit, fetchFromGitHub, bootPkgs }:
|
||||
{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
|
||||
|
||||
bootPkgs.callPackage ./base.nix {
|
||||
version = "0.2.020170323";
|
||||
|
||||
inherit bootPkgs;
|
||||
inherit bootPkgs cabal-install;
|
||||
|
||||
ghcjsSrc = fetchFromGitHub {
|
||||
owner = "ghcjs";
|
||||
|
|
|
|||
|
|
@ -949,4 +949,7 @@ self: super: {
|
|||
# Add support for https://github.com/haskell-hvr/multi-ghc-travis.
|
||||
multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; };
|
||||
|
||||
# https://github.com/yesodweb/Shelly.hs/issues/162
|
||||
shelly = dontCheck super.shelly;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,4 +68,8 @@ self: super: {
|
|||
# inline-c > 0.5.6.0 requires template-haskell >= 2.12
|
||||
inline-c = super.inline-c_0_5_6_1;
|
||||
inline-c-cpp = super.inline-c-cpp_0_1_0_0;
|
||||
|
||||
# Newer versions require GHC 8.2.
|
||||
haddock-api = self.haddock-api_2_17_4;
|
||||
haddock = self.haddock_2_17_5;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145645,17 +145645,17 @@ self: {
|
|||
}) {};
|
||||
|
||||
"nix-paths" = callPackage
|
||||
({ mkDerivation, base, nix, nix-hash, process }:
|
||||
({ mkDerivation, base, nix, process }:
|
||||
mkDerivation {
|
||||
pname = "nix-paths";
|
||||
version = "1.0.1";
|
||||
sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb";
|
||||
libraryHaskellDepends = [ base process ];
|
||||
libraryToolDepends = [ nix nix-hash ];
|
||||
libraryToolDepends = [ nix ];
|
||||
homepage = "https://github.com/peti/nix-paths";
|
||||
description = "Knowledge of Nix's installation directories";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {inherit (pkgs) nix; nix-hash = null;};
|
||||
}) {inherit (pkgs) nix;};
|
||||
|
||||
"nixfromnpm" = callPackage
|
||||
({ mkDerivation, aeson, ansi-terminal, base, bytestring
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgumbo-${version}";
|
||||
name = "gumbo-${version}";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, buildPythonPackage, fetchurl, pygments, greenlet, curtsies, urwid, requests, mock }:
|
||||
{ stdenv, buildPythonPackage, fetchPypi, pygments, greenlet, curtsies, urwid, requests, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bpython";
|
||||
version = "0.17";
|
||||
# 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706
|
||||
src = fetchurl {
|
||||
url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "13fyyx06645ikvmj9zmkixr12kzk1c3a3f9s9i2rvaczjycn82lz";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, pytest, psutil, pytestrunner
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
}:
|
||||
|
||||
let
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "multidict";
|
||||
version = "4.0.0";
|
||||
in buildPythonPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
|
||||
sha256 = "b72486b3ad2b8444f7afebdafda8b111c1803e37203dfe81b7765298f2781778";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0y0pg3r9hlknny0zwg906wz81h8in6lgvnpbmzvl911bmnrqc95p";
|
||||
};
|
||||
|
||||
buildInputs = [ cython ];
|
||||
|
|
|
|||
26
pkgs/development/tools/gpp/default.nix
Normal file
26
pkgs/development/tools/gpp/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpp-${version}";
|
||||
version = "2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "logological";
|
||||
repo = "gpp";
|
||||
rev = "96c5dd8905384ea188f380f51d24cbd7fd58f642";
|
||||
sha256 = "0bvhnx3yfhbfiqqhhz6k2a596ls5rval7ykbp3jl5b6062xj861b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
installCheckPhase = "$out/bin/gpp --help";
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "General-purpose preprocessor with customizable syntax";
|
||||
homepage = "https://logological.org/gpp";
|
||||
license = licenses.lgpl3;
|
||||
maintainers = with maintainers; [ nmattia ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "patchelf-0.10-pre-20160920";
|
||||
name = "patchelf-0.10-pre-20180108";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "patchelf";
|
||||
rev = "327d80443672c397970738f9e216a7e86cbf3ad7";
|
||||
sha256 = "0nghzywda4jrj70gvn4dnrzasafgdp0basj04wfir1smvsi047zr";
|
||||
rev = "48452cf6b4ccba1c1f47a09f4284a253634ab7d1";
|
||||
sha256 = "1f1s8q3as3nrhcc1a8qc2z7imm644jfz44msn9sfv4mdynp2m2yb";
|
||||
};
|
||||
|
||||
setupHook = [ ./setup-hook.sh ];
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ in stdenv.mkDerivation rec {
|
|||
$out/bin/phantomjs
|
||||
'' + ''
|
||||
wrapProgram $out/bin/phantomjs \
|
||||
--set QT_QPA_PLATFORM offscreen \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ qtbase ]}
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,30 @@
|
|||
{ stdenv, writeText, toolchainName, sdkName, xcbuild }:
|
||||
|
||||
let
|
||||
# TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here.
|
||||
version = "10.10";
|
||||
|
||||
SDKSettings = {
|
||||
CanonicalName = sdkName;
|
||||
DisplayName = sdkName;
|
||||
Toolchains = [ toolchainName ];
|
||||
Version = "10.10";
|
||||
MaximumDeploymentTarget = "10.10";
|
||||
Version = version;
|
||||
MaximumDeploymentTarget = version;
|
||||
isBaseSDK = "YES";
|
||||
};
|
||||
|
||||
SystemVersion = {
|
||||
ProductName = "Mac OS X";
|
||||
ProductVersion = "10.10";
|
||||
ProductVersion = version;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "MacOSX.sdk";
|
||||
name = "MacOSX${version}.sdk";
|
||||
inherit version;
|
||||
|
||||
buildInputs = [ xcbuild ];
|
||||
|
||||
buildCommand = ''
|
||||
mkdir -p $out/
|
||||
plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xcbuild-wrapper";
|
||||
name = "xcbuild-wrapper-${xcbuild.version}";
|
||||
|
||||
buildInputs = [ xcbuild makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A model-airplane flight simulator";
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin the-kenny ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
dfVersion = "0.44.03";
|
||||
version = "${dfVersion}-beta1";
|
||||
dfVersion = "0.44.05";
|
||||
version = "${dfVersion}-alpha1";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1gyaq6krm0cvccyw7rdy6afh9vy983dl86d0wnpr25dl3jky27xw";
|
||||
sha256 = "1hr3qsx7rd36syw7dfp4lh8kpmz1pvva757za2yn34hj1jm4nh52";
|
||||
|
||||
# revision of library/xml submodule
|
||||
xmlRev = "7e23a328fd81e3d6db794c0c18b8b2e7bd235649";
|
||||
xmlRev = "3a9f401d196ee8ebc53edb9e15a13bfcb0879b4e";
|
||||
|
||||
arch =
|
||||
if stdenv.system == "x86_64-linux" then "64"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dwarf-therapist-original-${version}";
|
||||
version = "39.1.2";
|
||||
version = "39.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dwarf-Therapist";
|
||||
repo = "Dwarf-Therapist";
|
||||
rev = "v${version}";
|
||||
sha256 = "0j5pldc184xv1mhdrhsmp23g58cy9a2bba27djigkh2sd5rksgji";
|
||||
sha256 = "1ddy9b9ly1231pnjs43gj7pvc77wjvs4j2rlympal81vyabaphmy";
|
||||
};
|
||||
|
||||
outputs = [ "out" "layouts" ];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
let
|
||||
baseVersion = "44";
|
||||
patchVersion = "03";
|
||||
patchVersion = "05";
|
||||
dfVersion = "0.${baseVersion}.${patchVersion}";
|
||||
libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
|
||||
platform =
|
||||
|
|
@ -12,8 +12,8 @@ let
|
|||
else if stdenv.system == "i686-linux" then "linux32"
|
||||
else throw "Unsupported platform";
|
||||
sha256 =
|
||||
if stdenv.system == "x86_64-linux" then "0bgrkwcdghwch96krqdwq8lcjwr6svw0xl53d2jysyszfy7nfl88"
|
||||
else if stdenv.system == "i686-linux" then "1mvnbkjvm68z2q7h81jrh70qy9458b1spv0m3nlc680fm19hpz40"
|
||||
if stdenv.system == "x86_64-linux" then "18bjyhjp5458bfbizm8vq4s00pqpfs097qp6pv76m84kgbc4ghg3"
|
||||
else if stdenv.system == "i686-linux" then "1b9i4kf4c8s6bhqwn8jx100mg7fqp8nmswrai5w8dsma01py4amr"
|
||||
else throw "Unsupported platform";
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2016-1_196";
|
||||
dfVersion = "0.44.03";
|
||||
dfVersion = "0.44.05";
|
||||
inherit soundPack;
|
||||
name = "soundsense-${version}";
|
||||
src = fetchzip {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cla-theme-${version}";
|
||||
version = "44.01-v24";
|
||||
version = "44.xx-v25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DFgraphics";
|
||||
repo = "CLA";
|
||||
rev = version;
|
||||
sha256 = "1lyazrls2vr8z58vfk5nvaffyv048j5xkr4wjvp6vrqxxvrxyrfd";
|
||||
sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
cp -r data raw $out
|
||||
'';
|
||||
|
||||
passthru.dfVersion = "0.44.03";
|
||||
passthru.dfVersion = "0.44.05";
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "phoebus-theme-${version}";
|
||||
version = "44.03";
|
||||
version = "44.05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DFgraphics";
|
||||
repo = "Phoebus";
|
||||
rev = version;
|
||||
sha256 = "0jpklikg2bf315m45kdkhd1n1plzb4jwzsg631gqfm9dwnrcs4w3";
|
||||
sha256 = "06mhr6dpbvwp9dxn70kyr6dwyql2k6x5zba2zf6awjah7idys0xr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
cp -r data raw $out
|
||||
'';
|
||||
|
||||
passthru.dfVersion = "0.44.03";
|
||||
passthru.dfVersion = "0.44.05";
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, ncurses, glib, gtk2, libsndfile, zlib
|
||||
}:
|
||||
|
||||
let dfVersion = "0.44.03"; in
|
||||
let dfVersion = "0.44.05"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dwarf_fortress_unfuck-${dfVersion}";
|
||||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
owner = "svenstaro";
|
||||
repo = "dwarf_fortress_unfuck";
|
||||
rev = dfVersion;
|
||||
sha256 = "0rd8d2ilhhks9kdi9j73bpyf8j56fhmmsj21yzdc0a4v2hzyxn2w";
|
||||
sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ in rec {
|
|||
};
|
||||
|
||||
winetricks = fetchFromGitHub rec {
|
||||
version = "20171018";
|
||||
sha256 = "0qlnxyaydpqx87kfyrkkmwg0jv9dfh3mkq27g224a8v1kf9z3r3h";
|
||||
version = "20171222";
|
||||
sha256 = "04risg44kqq8z9nsflw7m7dqykw2aii8m8j495z6fgb7p0pi8ny9";
|
||||
owner = "Winetricks";
|
||||
repo = "winetricks";
|
||||
rev = version;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.15-rc8";
|
||||
modDirVersion = "4.15.0-rc8";
|
||||
version = "4.15-rc9";
|
||||
modDirVersion = "4.15.0-rc9";
|
||||
extraMeta.branch = "4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
sha256 = "15d24b47mfkfs2b0l54sq0yl3ylh5dnx23jknb2r7cq14wxiqmq3";
|
||||
sha256 = "18xhy38fqyzg9yiljhdj2y0skjf2yhxvhzbija3is75wyv7g55l6";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
|
|||
let
|
||||
name = "wireguard-${version}";
|
||||
|
||||
version = "0.0.20171221";
|
||||
version = "0.0.20180118";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
|
||||
sha256 = "1vf5dbwc2lgcf28k1m919w94hil2gcl0l4h4da1sh6r7kdz6k5rb";
|
||||
sha256 = "18x8ndnr4lvl3in5sian6f9q69pk8h4xbwldmk7bfrpb5m03ngs6";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "knot-resolver-${version}";
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
|
||||
sha256 = "146dcb24422ef685fb4167e3c536a838cf4101acaa85fcfa0c150eebdba78f81";
|
||||
sha256 = "0y2z5hia4pr1rsyqhf4dmyc7mvhsbc298pg4j1iqikpvx9b5iwrr";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "minio-exporter-${version}";
|
||||
version = "0.1.0";
|
||||
version = "0.2.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/joe-pll/minio-exporter";
|
||||
|
|
@ -11,9 +11,18 @@ buildGoPackage rec {
|
|||
inherit rev;
|
||||
owner = "joe-pll";
|
||||
repo = "minio-exporter";
|
||||
sha256 = "14lz4dg0n213b6xy12fh4r20k1rcnflnfg6gjskk5zr8h7978hjx";
|
||||
sha256 = "1my3ii5s479appiapw8gjzkq1pk62fl7d7if8ljvdj6qw4man6aa";
|
||||
};
|
||||
|
||||
# Required to make 0.2.0 build against latest dependencies
|
||||
# TODO: Remove on update to 0.3.0
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/joe-pll/minio-exporter/commit/50ab89d42322dc3e2696326a9ae4d3f951f646de.patch";
|
||||
sha256 = "0aiixhvb4x8c8abrlf1i4hmca9i6xd6b638a5vfkvawx0q7gxl97";
|
||||
})
|
||||
];
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# This file was generated by go2nix.
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/alecthomas/template";
|
||||
|
|
@ -32,8 +32,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-ini/ini";
|
||||
rev = "c787282c39ac1fc618827141a1f762240def08a3";
|
||||
sha256 = "0c784qichlpqdk1zwafislskchr7f4dl7fy3g3w7xg2w63xpd7r0";
|
||||
rev = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a";
|
||||
sha256 = "0mhgxw5q6b0pryhikx3k4wby7g32rwjjljzihi47lwn34kw5y1qn";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -41,8 +41,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/protobuf";
|
||||
rev = "130e6b02ab059e7b717a096f397c5b60111cae74";
|
||||
sha256 = "0zk4d7gcykig9ld8f5h86fdxshm2gs93a2xkpf52jd5m4z59q26s";
|
||||
rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845";
|
||||
sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -54,22 +54,13 @@
|
|||
sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/minio/go-homedir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/minio/go-homedir";
|
||||
rev = "21304a94172ae3a09dee2cd86a12fb6f842138c7";
|
||||
sha256 = "1kvz91gvdrpzddlpcbf0a2kf75bfqzd40kwzq29jwhf1y5ii6cq4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/minio/minio-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/minio/minio-go";
|
||||
rev = "cb3571b7d8d904c4714033deb984d0a0b66955be";
|
||||
sha256 = "165filzwslnqdgsp8wf5k1zm8wcpnsffsaffw25igy0ik8swr06w";
|
||||
rev = "d218e4cb1bfc13dcef0eb5c3e74507a35be0dd3a";
|
||||
sha256 = "0d3am33xaavdffz791qi2s0vnkpjw9vlr5p5g4lw7h5vhmy1sjb4";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -77,8 +68,17 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/minio/minio";
|
||||
rev = "60cc6184d253efee4a3120683517028342229e21";
|
||||
sha256 = "0n2l163v45jraylv43jwqm0cxin68vw8cw7k21qniahhr46y4dqf";
|
||||
rev = "bb73c84b104bc447eb603d63481cdc54b8ab3c83";
|
||||
sha256 = "1gjkgdf59yxfr2a7pl3f7z3iid86zsd85xqxcv1s0d46v7j07iga";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/go-homedir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-homedir";
|
||||
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
|
||||
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -86,8 +86,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_golang";
|
||||
rev = "353b8c3f3776541879f9abfd8fa8b1ae162ab394";
|
||||
sha256 = "068fk3bdfsaij37973c66065w2cn46ahwjs44pw9v1mqk8bsrn3a";
|
||||
rev = "06bc6e01f4baf4ee783ffcd23abfcb0b0f9dfada";
|
||||
sha256 = "0dvv21214sn702kc25y5l0gd9d11358976d3w31fgwx7456mjx26";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -95,8 +95,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/client_model";
|
||||
rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
|
||||
sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
|
||||
rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
|
||||
sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -104,8 +104,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/common";
|
||||
rev = "2f17f4a9d485bf34b4bfaccc273805040e4f86c8";
|
||||
sha256 = "0r1dyipnd7n9vp4p6gs1y4v7ggq4avj06pr90l4qrjll55h281js";
|
||||
rev = "89604d197083d4781071d3c65855d24ecfb0a563";
|
||||
sha256 = "169rdlaf2mk9z4fydz7ajmngyhmf3q1lk96yhvx46bn986x5xkyn";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -113,8 +113,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/prometheus/procfs";
|
||||
rev = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2";
|
||||
sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np";
|
||||
rev = "b15cd069a83443be3154b719d0cc9fe8117f09fb";
|
||||
sha256 = "1cr45wg2m40bj2za8f32mq09rjlcnk5kfam0h0hr8wcb015k4wxj";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -122,8 +122,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sirupsen/logrus";
|
||||
rev = "89742aefa4b206dcf400792f3bd35b542998eb3b";
|
||||
sha256 = "0hk7fabx59msg2y0iik6xvfp80s73ybrwlcshbm9ds91iqbkcxi6";
|
||||
rev = "d682213848ed68c0a260ca37d6dd5ace8423f5ba";
|
||||
sha256 = "0nzyqwzx3k7nqfq8q7yv32gaf3ymq3bpwhkmw1hj2zakq5a93d8x";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -131,8 +131,17 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "76eec36fa14229c4b25bb894c2d0e591527af429";
|
||||
sha256 = "1c57fdg70vhf7pigiwb2xdap6ak0c0s2pzaj9pq000aqfw54i4s8";
|
||||
rev = "a6600008915114d9c087fad9f03d75087b1a74df";
|
||||
sha256 = "099vyf8133bjwaqcv377d9akam3j5xwamwqrihmjhvzbvqs649yc";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec";
|
||||
sha256 = "0bdwdxy2gz48icnh023r5fga3z4x6c8gry8jlfjqr5w12y3s281g";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -140,8 +149,17 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "314a259e304ff91bd6985da2a7149bbf91237993";
|
||||
sha256 = "0vya62c3kmhmqx6awlxx8hc84987xkym9rhs0q28vlhwk9kczdaa";
|
||||
rev = "2c42eef0765b9837fbdab12011af7830f55f88f0";
|
||||
sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "e19ae1496984b1c655b8044a65c0300a3c878dd3";
|
||||
sha256 = "1cvnnx8nwx5c7gr6ajs7sldhbqh52n7h6fsa3i21l2lhx6xrsh4w";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -149,8 +167,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/alecthomas/kingpin.v2";
|
||||
rev = "1087e65c9441605df944fb12c33f0fe7072d18ca";
|
||||
sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0";
|
||||
rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
|
||||
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -64,6 +64,13 @@ in stdenv.mkDerivation rec {
|
|||
mkdir -p $out/bin
|
||||
ln -s $programPath $binaryPath
|
||||
done
|
||||
|
||||
# disable component updater and update check
|
||||
substituteInPlace $out/google-cloud-sdk/lib/googlecloudsdk/core/config.json \
|
||||
--replace "\"disable_updater\": false" "\"disable_updater\": true"
|
||||
echo "
|
||||
[component_manager]
|
||||
disable_update_check = true" >> $out/google-cloud-sdk/properties
|
||||
|
||||
# setup bash completion
|
||||
mkdir -p "$out/etc/bash_completion.d/"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation {
|
|||
description = "A program used to control monitor parameters by software";
|
||||
homepage = http://ddccontrol.sourceforge.net/;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
maintainers = [ stdenv.lib.maintainers.pakhfn ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
36
pkgs/tools/misc/tewisay/default.nix
Normal file
36
pkgs/tools/misc/tewisay/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "tewisay-unstable-${version}";
|
||||
version = "2017-04-14";
|
||||
|
||||
goPackagePath = "github.com/lucy/tewisay";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lucy";
|
||||
repo = "tewisay";
|
||||
rev = "e3fc38737cedb79d93b8cee07207c6c86db4e488";
|
||||
sha256 = "1na3xi4z90v8qydcvd3454ia9jg7qhinciy6kvgyz61q837cw5dk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
postInstall = ''
|
||||
install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $bin/bin/tewisay \
|
||||
--prefix COWPATH : $bin/share/tewisay/cows
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = https://github.com/lucy/tewisay;
|
||||
description = "Cowsay replacement with unicode and partial ansi escape support";
|
||||
license = stdenv.lib.licenses.cc0;
|
||||
maintainers = [ stdenv.lib.maintainers.chiiruno ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
21
pkgs/tools/misc/tewisay/deps.nix
Normal file
21
pkgs/tools/misc/tewisay/deps.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
|
||||
sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ogier/pflag";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ogier/pflag";
|
||||
rev = "45c278ab3607870051a2ea9040bb85fcb8557481";
|
||||
sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -38,6 +38,8 @@ stdenv.mkDerivation {
|
|||
cp ./nix-info $out/bin/nix-info
|
||||
'';
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = {
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, binutils-unwrapped }:
|
||||
{ stdenv, fetchFromGitHub, makeWrapper, coreutils, binutils-unwrapped }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spectre-meltdown-checker-${version}";
|
||||
version = "0.31";
|
||||
version = "0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "speed47";
|
||||
repo = "spectre-meltdown-checker";
|
||||
rev = "v${version}";
|
||||
sha256 = "14g5q2prd5w2zhwi7sr9pnalakd87zkvxk0vrzw4cv3x71d44nk2";
|
||||
sha256 = "1qd3cwmg3p309czmghczlacygiyngp2wcwdghacg0y4l9vrndg8c";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -94,6 +94,7 @@ mapAliases (rec {
|
|||
libcap_manpages = libcap.doc; # added 2016-04-29
|
||||
libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
|
||||
libcap_progs = libcap.out; # added 2016-04-29
|
||||
libgumbo = gumbo; # added 2018-01-21
|
||||
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
|
||||
libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
|
||||
libtidy = html-tidy; # added 2014-12-21
|
||||
|
|
|
|||
|
|
@ -2470,6 +2470,8 @@ with pkgs;
|
|||
|
||||
gpodder = callPackage ../applications/audio/gpodder { };
|
||||
|
||||
gpp = callPackage ../development/tools/gpp { };
|
||||
|
||||
gpredict = callPackage ../applications/science/astronomy/gpredict { };
|
||||
|
||||
gptfdisk = callPackage ../tools/system/gptfdisk { };
|
||||
|
|
@ -4824,6 +4826,8 @@ with pkgs;
|
|||
|
||||
telepresence = callPackage ../tools/networking/telepresence { };
|
||||
|
||||
tewisay = callPackage ../tools/misc/tewisay { };
|
||||
|
||||
texmacs = callPackage ../applications/editors/texmacs {
|
||||
tex = texlive.combined.scheme-small;
|
||||
extraFonts = true;
|
||||
|
|
@ -8929,6 +8933,8 @@ with pkgs;
|
|||
|
||||
gts = callPackage ../development/libraries/gts { };
|
||||
|
||||
gumbo = callPackage ../development/libraries/gumbo { };
|
||||
|
||||
gvfs = callPackage ../development/libraries/gvfs {
|
||||
gnome = self.gnome3;
|
||||
};
|
||||
|
|
@ -9507,8 +9513,6 @@ with pkgs;
|
|||
inherit (perlPackages) libintlperl GetoptLong SysVirt;
|
||||
};
|
||||
|
||||
libgumbo = callPackage ../development/libraries/libgumbo { };
|
||||
|
||||
libhangul = callPackage ../development/libraries/libhangul { };
|
||||
|
||||
libharu = callPackage ../development/libraries/libharu { };
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }:
|
||||
{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform, cabal-install }:
|
||||
|
||||
let
|
||||
# These are attributes in compiler and packages that don't support integer-simple.
|
||||
|
|
@ -91,10 +91,12 @@ in rec {
|
|||
selfPkgs = packages.ghcHEAD;
|
||||
};
|
||||
ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
|
||||
bootPkgs = packages.ghc821Binary;
|
||||
bootPkgs = packages.ghc7103;
|
||||
inherit cabal-install;
|
||||
};
|
||||
ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
|
||||
bootPkgs = packages.ghc821Binary;
|
||||
bootPkgs = packages.ghc802;
|
||||
inherit cabal-install;
|
||||
};
|
||||
ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec {
|
||||
bootPkgs = packages.ghc7103Binary;
|
||||
|
|
|
|||
|
|
@ -2859,15 +2859,15 @@ in {
|
|||
|
||||
tablib = buildPythonPackage rec {
|
||||
name = "tablib-${version}";
|
||||
version = "0.10.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/t/tablib/tablib-${version}.tar.gz";
|
||||
sha256 = "14wc8bmz60g35r6gsyhdzfvgfqpd3gw9lfkq49z5bxciykbxmhj1";
|
||||
sha256 = "11wxchj0qz77dn79yiq30k4b4gsm429f4bizk4lm4rb63nk51kxq";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pytest ];
|
||||
|
||||
buildInputs = with self; [ pytest unicodecsv pandas ];
|
||||
propagatedBuildInputs = with self; [ xlwt openpyxl pyyaml xlrd odfpy ];
|
||||
meta = with stdenv.lib; {
|
||||
description = "Tablib: format-agnostic tabular dataset library";
|
||||
homepage = "http://python-tablib.org";
|
||||
|
|
|
|||
Loading…
Reference in a new issue