mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 05:37:27 +03:00
Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
32e827b848
@ -67,13 +67,13 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim
|
||||
+ `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`.
|
||||
+ `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`.
|
||||
|
||||
### Build phase
|
||||
### Building Agda packages
|
||||
The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file.
|
||||
If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden.
|
||||
Additionally, a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file.
|
||||
`agda` and the Agda libraries contained in `buildInputs` are made available during the build phase.
|
||||
|
||||
### Install phase
|
||||
### Installing Agda packages
|
||||
The default install phase copies agda source files, agda interface files (`*.agdai`) and `*.agda-lib` files to the output directory.
|
||||
This can be overridden.
|
||||
|
||||
|
||||
@ -1616,6 +1616,12 @@
|
||||
githubId = 12202789;
|
||||
name = "CrazedProgrammer";
|
||||
};
|
||||
cript0nauta = {
|
||||
email = "shareman1204@gmail.com";
|
||||
github = "cript0nauta";
|
||||
githubId = 1222362;
|
||||
name = "Matías Lang";
|
||||
};
|
||||
cryptix = {
|
||||
email = "cryptix@riseup.net";
|
||||
github = "cryptix";
|
||||
@ -2546,6 +2552,16 @@
|
||||
githubId = 11909469;
|
||||
name = "Fabian Geiselhart";
|
||||
};
|
||||
fabianhauser = {
|
||||
email = "fabian.nixos@fh2.ch";
|
||||
github = "fabianhauser";
|
||||
githubId = 368799;
|
||||
name = "Fabian Hauser";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x8A52A140BEBF7D2C";
|
||||
fingerprint = "50B7 11F4 3DFD 2018 DCE6 E8D0 8A52 A140 BEBF 7D2C";
|
||||
}];
|
||||
};
|
||||
fadenb = {
|
||||
email = "tristan.helmich+nixos@gmail.com";
|
||||
github = "fadenb";
|
||||
@ -3867,6 +3883,12 @@
|
||||
githubId = 11947756;
|
||||
name = "Julien Dehos";
|
||||
};
|
||||
julm = {
|
||||
email = "julm+nix@sourcephile.fr";
|
||||
github = "ju1m";
|
||||
githubId = 21160136;
|
||||
name = "Julien Moutinho";
|
||||
};
|
||||
jumper149 = {
|
||||
email = "felixspringer149@gmail.com";
|
||||
github = "jumper149";
|
||||
@ -3879,6 +3901,12 @@
|
||||
githubId = 2396926;
|
||||
name = "Justin Woo";
|
||||
};
|
||||
jwatt = {
|
||||
email = "jwatt@broken.watch";
|
||||
github = "jjwatt";
|
||||
githubId = 2397327;
|
||||
name = "Jesse Wattenbarger";
|
||||
};
|
||||
jwiegley = {
|
||||
email = "johnw@newartisans.com";
|
||||
github = "jwiegley";
|
||||
|
||||
@ -18,6 +18,7 @@ dkjson,,,,,
|
||||
fifo,,,,,
|
||||
http,,,,,vcunat
|
||||
inspect,,,,,
|
||||
ldbus,,http://luarocks.org/dev,,,
|
||||
ldoc,,,,,
|
||||
lgi,,,,,
|
||||
linenoise,,,,,
|
||||
|
||||
|
@ -57,6 +57,18 @@ with lib.maintainers; {
|
||||
scope = "Maintain GNOME desktop environment and platform.";
|
||||
};
|
||||
|
||||
matrix = {
|
||||
members = [
|
||||
ma27
|
||||
pacien
|
||||
fadenb
|
||||
mguentner
|
||||
ekleog
|
||||
ralith
|
||||
];
|
||||
scope = "Maintain the ecosystem around Matrix, a decentralized messenger.";
|
||||
};
|
||||
|
||||
php = {
|
||||
members = [
|
||||
aanderse
|
||||
|
||||
@ -19,9 +19,9 @@
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Start a root shell if something goes wrong in stage 1 of the boot process
|
||||
(the initial ramdisk). This is disabled by default because there is no
|
||||
authentication for the root shell.
|
||||
Allows the user to start a root shell if something goes wrong in stage 1
|
||||
of the boot process (the initial ramdisk). This is disabled by default
|
||||
because there is no authentication for the root shell.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
@ -49,6 +49,22 @@
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>boot.debug1mounts</literal>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
Like <literal>boot.debug1</literal> or
|
||||
<literal>boot.debug1devices</literal>, but runs stage1 until all
|
||||
filesystems that are mounted during initrd are mounted (see
|
||||
<option><link linkend="opt-fileSystems._name__.neededForBoot">neededForBoot</link></option>
|
||||
). As a motivating example, this could be useful if you've forgotten to set
|
||||
<option><link linkend="opt-fileSystems._name__.neededForBoot">neededForBoot</link></option>
|
||||
on a file system.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<literal>boot.trace</literal>
|
||||
@ -90,6 +106,15 @@
|
||||
<manvolnum>1</manvolnum></citerefentry>.
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Notice that for <literal>boot.shell_on_fail</literal>,
|
||||
<literal>boot.debug1</literal>, <literal>boot.debug1devices</literal>, and
|
||||
<literal>boot.debug1mounts</literal>, if you did <emphasis>not</emphasis>
|
||||
select "start the new shell as pid 1", and you <literal>exit</literal> from
|
||||
the new shell, boot will proceed normally from the point where it failed, as
|
||||
if you'd chosen "ignore the error and continue".
|
||||
</para>
|
||||
|
||||
<para>
|
||||
If no login prompts or X11 login screens appear (e.g. due to hanging
|
||||
dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start
|
||||
|
||||
@ -94,6 +94,22 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" ''
|
||||
When MariaDB data directory is just upgraded (not initialized), the users are not created or modified.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
MySQL server is now started with additional systemd sandbox/hardening options for better security. The PrivateTmp, ProtectHome, and ProtectSystem options
|
||||
may be problematic when MySQL is attempting to read from or write to your filesystem anywhere outside of its own state directory, for example when
|
||||
calling <literal>LOAD DATA INFILE or SELECT * INTO OUTFILE</literal>. In this scenario a variant of the following may be required:
|
||||
- allow MySQL to read from /home and /tmp directories when using <literal>LOAD DATA INFILE</literal>
|
||||
<programlisting>
|
||||
systemd.services.mysql.serviceConfig.ProtectHome = lib.mkForce "read-only";
|
||||
</programlisting>
|
||||
- allow MySQL to write to custom folder <literal>/var/data</literal> when using <literal>SELECT * INTO OUTFILE</literal>, assuming the mysql user has write
|
||||
access to <literal>/var/data</literal>
|
||||
<programlisting>
|
||||
systemd.services.mysql.serviceConfig.ReadWritePaths = [ "/var/data" ];
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
@ -598,6 +614,34 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ];
|
||||
queued on the kernel side of the netlink socket.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
Specifying <link linkend="opt-services.dovecot2.mailboxes">mailboxes</link> in the <package>dovecot2</package> module
|
||||
as a list is deprecated and will break eval in 21.03. Instead, an attribute-set should be specified where the <literal>name</literal>
|
||||
should be the key of the attribute.
|
||||
</para>
|
||||
<para>
|
||||
This means that a configuration like this
|
||||
<programlisting>{
|
||||
<link linkend="opt-services.dovecot2.mailboxes">services.dovecot2.mailboxes</link> = [
|
||||
{ name = "Junk";
|
||||
auto = "create";
|
||||
}
|
||||
];
|
||||
}</programlisting>
|
||||
should now look like this:
|
||||
<programlisting>{
|
||||
<link linkend="opt-services.dovecot2.mailboxes">services.dovecot2.mailboxes</link> = {
|
||||
Junk.auto = "create";
|
||||
};
|
||||
}</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<package>netbeans</package> was upgraded to 12.0 and now defaults to OpenJDK 11. This might cause problems if your projects depend on packages that were removed in Java 11.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
@ -600,6 +600,38 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
warnings =
|
||||
builtins.filter (x: x != null) (
|
||||
flip mapAttrsToList cfg.users (name: user:
|
||||
# This regex matches a subset of the Modular Crypto Format (MCF)[1]
|
||||
# informal standard. Since this depends largely on the OS or the
|
||||
# specific implementation of crypt(3) we only support the (sane)
|
||||
# schemes implemented by glibc and BSDs. In particular the original
|
||||
# DES hash is excluded since, having no structure, it would validate
|
||||
# common mistakes like typing the plaintext password.
|
||||
#
|
||||
# [1]: https://en.wikipedia.org/wiki/Crypt_(C)
|
||||
let
|
||||
sep = "\\$";
|
||||
base64 = "[a-zA-Z0-9./]+";
|
||||
id = "[a-z0-9-]+";
|
||||
value = "[a-zA-Z0-9/+.-]+";
|
||||
options = "${id}(=${value})?(,${id}=${value})*";
|
||||
scheme = "${id}(${sep}${options})?";
|
||||
content = "${base64}${sep}${base64}";
|
||||
mcf = "^${sep}${scheme}${sep}${content}$";
|
||||
in
|
||||
if (user.hashedPassword != null
|
||||
&& builtins.match mcf user.hashedPassword == null)
|
||||
then
|
||||
''
|
||||
The password hash of user "${name}" may be invalid. You must set a
|
||||
valid hash or the user will be locked out of his account. Please
|
||||
check the value of option `users.users."${name}".hashedPassword`.
|
||||
''
|
||||
else null
|
||||
));
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -126,6 +126,7 @@
|
||||
./programs/gpaste.nix
|
||||
./programs/gnupg.nix
|
||||
./programs/gphoto2.nix
|
||||
./programs/hamster.nix
|
||||
./programs/iftop.nix
|
||||
./programs/iotop.nix
|
||||
./programs/java.nix
|
||||
|
||||
15
nixos/modules/programs/hamster.nix
Normal file
15
nixos/modules/programs/hamster.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
meta.maintainers = maintainers.fabianhauser;
|
||||
|
||||
options.programs.hamster.enable =
|
||||
mkEnableOption "Whether to enable hamster time tracking.";
|
||||
|
||||
config = lib.mkIf config.programs.hamster.enable {
|
||||
environment.systemPackages = [ pkgs.hamster ];
|
||||
services.dbus.packages = [ pkgs.hamster ];
|
||||
};
|
||||
}
|
||||
@ -173,7 +173,9 @@ in
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
security.sudo.extraRules = [
|
||||
# We `mkOrder 600` so that the default rule shows up first, but there is
|
||||
# still enough room for a user to `mkBefore` it.
|
||||
security.sudo.extraRules = mkOrder 600 [
|
||||
{ groups = [ "wheel" ];
|
||||
commands = [ { command = "ALL"; options = (if cfg.wheelNeedsPassword then [ "SETENV" ] else [ "NOPASSWD" "SETENV" ]); } ];
|
||||
}
|
||||
|
||||
@ -334,7 +334,8 @@ in
|
||||
environment.etc."my.cnf".source = cfg.configFile;
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.dataDir}' 0700 ${cfg.user} mysql -"
|
||||
"d '${cfg.dataDir}' 0700 ${cfg.user} mysql - -"
|
||||
"z '${cfg.dataDir}' 0700 ${cfg.user} mysql - -"
|
||||
];
|
||||
|
||||
systemd.services.mysql = let
|
||||
@ -357,21 +358,17 @@ in
|
||||
preStart = if isMariaDB then ''
|
||||
if ! test -e ${cfg.dataDir}/mysql; then
|
||||
${mysql}/bin/mysql_install_db --defaults-file=/etc/my.cnf ${mysqldOptions}
|
||||
touch /tmp/mysql_init
|
||||
touch ${cfg.dataDir}/mysql_init
|
||||
fi
|
||||
'' else ''
|
||||
if ! test -e ${cfg.dataDir}/mysql; then
|
||||
${mysql}/bin/mysqld --defaults-file=/etc/my.cnf ${mysqldOptions} --initialize-insecure
|
||||
touch /tmp/mysql_init
|
||||
touch ${cfg.dataDir}/mysql_init
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = "mysql";
|
||||
Type = if hasNotify then "notify" else "simple";
|
||||
RuntimeDirectory = "mysqld";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
Restart = "on-abort";
|
||||
RestartSec = "5s";
|
||||
# The last two environment variables are used for starting Galera clusters
|
||||
@ -398,7 +395,7 @@ in
|
||||
done
|
||||
''}
|
||||
|
||||
if [ -f /tmp/mysql_init ]
|
||||
if [ -f ${cfg.dataDir}/mysql_init ]
|
||||
then
|
||||
${concatMapStrings (database: ''
|
||||
# Create initial databases
|
||||
@ -452,7 +449,7 @@ in
|
||||
cat ${toString cfg.initialScript} | ${mysql}/bin/mysql -u root -N
|
||||
''}
|
||||
|
||||
rm /tmp/mysql_init
|
||||
rm ${cfg.dataDir}/mysql_init
|
||||
fi
|
||||
|
||||
${optionalString (cfg.ensureDatabases != []) ''
|
||||
@ -476,6 +473,35 @@ in
|
||||
# ensureDatbases & ensureUsers depends on this script being run as root
|
||||
# when the user has secured their mysql install
|
||||
"+${setupScript}";
|
||||
# User and group
|
||||
User = cfg.user;
|
||||
Group = "mysql";
|
||||
# Runtime directory and mode
|
||||
RuntimeDirectory = "mysqld";
|
||||
RuntimeDirectoryMode = "0755";
|
||||
# Access write directories
|
||||
ReadWritePaths = [ cfg.dataDir ];
|
||||
# Capabilities
|
||||
CapabilityBoundingSet = "";
|
||||
# Security
|
||||
NoNewPrivileges = true;
|
||||
# Sandboxing
|
||||
ProtectSystem = "strict";
|
||||
ProtectHome = true;
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
PrivateMounts = true;
|
||||
# System Call Filtering
|
||||
SystemCallArchitectures = "native";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -125,6 +125,8 @@ let
|
||||
mailboxConfig = mailbox: ''
|
||||
mailbox "${mailbox.name}" {
|
||||
auto = ${toString mailbox.auto}
|
||||
'' + optionalString (mailbox.autoexpunge != null) ''
|
||||
autoexpunge = ${mailbox.autoexpunge}
|
||||
'' + optionalString (mailbox.specialUse != null) ''
|
||||
special_use = \${toString mailbox.specialUse}
|
||||
'' + "}";
|
||||
@ -132,8 +134,9 @@ let
|
||||
mailboxes = { ... }: {
|
||||
options = {
|
||||
name = mkOption {
|
||||
type = types.strMatching ''[^"]+'';
|
||||
type = types.nullOr (types.strMatching ''[^"]+'');
|
||||
example = "Spam";
|
||||
default = null;
|
||||
description = "The name of the mailbox.";
|
||||
};
|
||||
auto = mkOption {
|
||||
@ -148,6 +151,15 @@ let
|
||||
example = "Junk";
|
||||
description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid.";
|
||||
};
|
||||
autoexpunge = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "60d";
|
||||
description = ''
|
||||
To automatically remove all email from the mailbox which is older than the
|
||||
specified time.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
@ -323,9 +335,24 @@ in
|
||||
};
|
||||
|
||||
mailboxes = mkOption {
|
||||
type = types.listOf (types.submodule mailboxes);
|
||||
default = [];
|
||||
example = [ { name = "Spam"; specialUse = "Junk"; auto = "create"; } ];
|
||||
type = with types; let m = submodule mailboxes; in either (listOf m) (attrsOf m);
|
||||
default = {};
|
||||
apply = x:
|
||||
if isList x then warn "Declaring `services.dovecot2.mailboxes' as a list is deprecated and will break eval in 21.03!" x
|
||||
else mapAttrsToList (name: value:
|
||||
if value.name != null
|
||||
then throw ''
|
||||
When specifying dovecot2 mailboxes as attributes, declaring
|
||||
a `name'-attribute is prohibited! The name ${value.name} should
|
||||
be the attribute key!
|
||||
''
|
||||
else value // { inherit name; }
|
||||
) x;
|
||||
example = literalExample ''
|
||||
{
|
||||
Spam = { specialUse = "Junk"; auto = "create"; };
|
||||
}
|
||||
'';
|
||||
description = "Configure mailboxes and auto create or subscribe them.";
|
||||
};
|
||||
|
||||
|
||||
@ -727,5 +727,6 @@ in {
|
||||
];
|
||||
|
||||
meta.doc = ./matrix-synapse.xml;
|
||||
meta.maintainers = teams.matrix.members;
|
||||
|
||||
}
|
||||
|
||||
@ -107,6 +107,7 @@ in
|
||||
++ cfg.lockOn.extraTargets;
|
||||
before = optional cfg.lockOn.suspend "systemd-suspend.service"
|
||||
++ optional cfg.lockOn.hibernate "systemd-hibernate.service"
|
||||
++ optional (cfg.lockOn.hibernate || cfg.lockOn.suspend) "systemd-suspend-then-hibernate.service"
|
||||
++ cfg.lockOn.extraTargets;
|
||||
serviceConfig = {
|
||||
Type = "forking";
|
||||
|
||||
@ -826,8 +826,13 @@ in
|
||||
config = {
|
||||
|
||||
warnings = concatLists (mapAttrsToList (name: service:
|
||||
optional (service.serviceConfig.Type or "" == "oneshot" && service.serviceConfig.Restart or "no" != "no")
|
||||
"Service ‘${name}.service’ with ‘Type=oneshot’ must have ‘Restart=no’") cfg.services);
|
||||
let
|
||||
type = service.serviceConfig.Type or "";
|
||||
restart = service.serviceConfig.Restart or "no";
|
||||
in optional
|
||||
(type == "oneshot" && (restart == "always" || restart == "on-success"))
|
||||
"Service '${name}.service' with 'Type=oneshot' cannot have 'Restart=always' or 'Restart=on-success'")
|
||||
cfg.services);
|
||||
|
||||
system.build.units = cfg.units;
|
||||
|
||||
|
||||
@ -448,7 +448,7 @@ in
|
||||
description =
|
||||
''
|
||||
An alternate BIOS (such as <package>qboot</package>) with which to start the VM.
|
||||
Should containin a file named <literal>bios.bin</literal>.
|
||||
Should contain a file named <literal>bios.bin</literal>.
|
||||
If <literal>null</literal>, QEMU's builtin SeaBIOS will be used.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -29,8 +29,8 @@ import ./make-test-python.nix ({ pkgs, ... } : let
|
||||
in {
|
||||
|
||||
name = "matrix-synapse";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ corngood ];
|
||||
meta = with pkgs.stdenv.lib; {
|
||||
maintainers = teams.matrix.members;
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
||||
@ -12,11 +12,11 @@
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.9.5";
|
||||
version = "2.9.6";
|
||||
pname = "asunder";
|
||||
src = fetchurl {
|
||||
url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2";
|
||||
sha256 = "069x6az2r3wlb2hd07iz0hxpxwknw7s9h7pyhnkmzv1pw9ci3kk4";
|
||||
sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ft2-clone";
|
||||
version = "1.24";
|
||||
version = "1.25_fix";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "ft2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "0wb7xsc2m9f4q5zsf5ai6h6c0558lkziv30b5a8ic64wp0layr6k";
|
||||
sha256 = "0q2mcp3xpgwilmiwzr9nnxlyg9c1kynh6cxzlyd95n520j00s6i7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pt2-clone";
|
||||
version = "1.17";
|
||||
version = "1.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8bitbubsy";
|
||||
repo = "pt2-clone";
|
||||
rev = "v${version}";
|
||||
sha256 = "0paagzc1c7gdnvs2wwsw2h15d0x8a7fl995qq3pi06g8kmdm85pi";
|
||||
sha256 = "0lr8gq4immc5cx1wr5ng6ccxs9afbd2dk6i0n5np25z14dvbvk3k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, pulseaudio
|
||||
, pkgconfig
|
||||
, ffmpeg_4
|
||||
, ffmpeg
|
||||
, patchelf
|
||||
, fdk_aac
|
||||
, libtool
|
||||
@ -45,7 +45,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
pulseaudio
|
||||
ffmpeg_4
|
||||
ffmpeg
|
||||
fdk_aac
|
||||
libtool
|
||||
ldacbt
|
||||
@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
|
||||
for so in $out/lib/pulse-${pulseaudio.version}/modules/*.so; do
|
||||
orig_rpath=$(patchelf --print-rpath "$so")
|
||||
patchelf \
|
||||
--set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg_4}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
|
||||
--set-rpath "${ldacbt}/lib:${lib.getLib ffmpeg}/lib:$out/lib/pulse-${pulseaudio.version}/modules:$orig_rpath" \
|
||||
"$so"
|
||||
done
|
||||
'';
|
||||
|
||||
@ -35,13 +35,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "strawberry";
|
||||
version = "0.6.10";
|
||||
version = "0.6.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonaski";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld";
|
||||
sha256 = "0p09xp7andfg0gvarzc979pwglr0xjj1c0cziqj0c9z7p1v0fkws";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,59 +1,74 @@
|
||||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck, hexdump
|
||||
, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
|
||||
, withGui }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, autoreconfHook
|
||||
, db48
|
||||
, boost
|
||||
, zeromq
|
||||
, hexdump
|
||||
, zlib
|
||||
, miniupnpc
|
||||
, qtbase ? null
|
||||
, qttools ? null
|
||||
, wrapQtAppsHook ? null
|
||||
, utillinux
|
||||
, python3
|
||||
, qrencode
|
||||
, libevent
|
||||
, withGui
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "0.19.1";
|
||||
version = "0.20.0";
|
||||
majorMinorVersion = versions.majorMinor version;
|
||||
|
||||
desktop = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
|
||||
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
|
||||
};
|
||||
|
||||
pixmap = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
|
||||
sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "f2591d555b8e8c2e1bd780e40d53a91e165d8b3c7e0391ae2d24a0c0f23a7cc0";
|
||||
urls = [
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkgconfig autoreconfHook ]
|
||||
++ optional stdenv.isDarwin hexdump
|
||||
++ optional withGui wrapQtAppsHook;
|
||||
buildInputs = [ openssl db48 boost zlib zeromq
|
||||
miniupnpc libevent]
|
||||
++ optionals stdenv.isLinux [ utillinux ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ]
|
||||
++ optionals stdenv.isLinux [ utillinux ]
|
||||
++ optionals withGui [ qtbase qttools qrencode ];
|
||||
|
||||
postInstall = optional withGui ''
|
||||
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
|
||||
install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
] ++ optionals (!doCheck) [
|
||||
"--disable-tests"
|
||||
"--disable-gui-tests"
|
||||
]
|
||||
++ optionals withGui [ "--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--disable-bench"
|
||||
] ++ optionals (!doCheck) [
|
||||
"--disable-tests"
|
||||
"--disable-gui-tests"
|
||||
]
|
||||
++ optionals withGui [
|
||||
"--with-gui=qt5"
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
checkInputs = [ rapidcheck python3 ];
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -67,13 +82,15 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
description = "Peer-to-peer electronic cash system";
|
||||
longDescription= ''
|
||||
longDescription = ''
|
||||
Bitcoin is a free open source peer-to-peer electronic cash system that is
|
||||
completely decentralized, without the need for a central server or trusted
|
||||
parties. Users hold the crypto keys to their own money and transact directly
|
||||
with each other, with the help of a P2P network to check for double-spending.
|
||||
'';
|
||||
homepage = "https://bitcoin.org/";
|
||||
downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/";
|
||||
changelog = "https://bitcoincore.org/en/releases/${version}/";
|
||||
maintainers = with maintainers; [ roconnor AndersonTorres ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
version = "nc0.19.1";
|
||||
version = "nc0.20.0";
|
||||
name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "namecoin";
|
||||
repo = "namecoin-core";
|
||||
rev = version;
|
||||
sha256 = "13rdvngrl2w0gk7km3sd9fy8yxzgxlkcwn50ajsbrhgzl8kx4q7m";
|
||||
sha256 = "115nlsq5g169mj4qjmkhxx1bnx740871zqyng9zbm2y4i0xf71c4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
let
|
||||
versions = {
|
||||
atom = {
|
||||
version = "1.42.0";
|
||||
sha256 = "1ira528nwxi30jfwyivlac3wkkqb9d2z4jhxwq5m7mnpm5yli6jy";
|
||||
version = "1.48.0";
|
||||
sha256 = "1693bxbylf6jhld9bdcr5pigk36wqlbj89praldpz9s96yxig9s1";
|
||||
};
|
||||
|
||||
atom-beta = {
|
||||
version = "1.43.0";
|
||||
version = "1.49.0";
|
||||
beta = 0;
|
||||
sha256 = "06if3w5hx7njmyal0012zawn8f5af1z4bjcbzj2c0gd15nlsgm95";
|
||||
sha256 = "1fr6m4a7shdj3wpn6g4n95cqpkkg2x9srwjf7bqxv9f3d5jb1y33";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
|
||||
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
|
||||
, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk
|
||||
, at-spi2-core
|
||||
}:
|
||||
|
||||
let
|
||||
@ -10,7 +11,7 @@ let
|
||||
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
|
||||
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
|
||||
xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
|
||||
xorg.libxcb libsecret libuuid at-spi2-atk
|
||||
xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core
|
||||
];
|
||||
|
||||
libPathNative = lib.makeLibraryPath packages;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kdev-python";
|
||||
version = "5.5.1";
|
||||
version = "5.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz";
|
||||
sha256 = "0k4j2kp77sz2p8s77wmcawia81bx7vfb2nnh9lqxzdk2mmlg387c";
|
||||
sha256 = "1qxvsz19iv5fr0nvz75b13knmsbkhkgvlvrhip8y4j66ypscs652";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "kdevelop";
|
||||
version = "5.5.1";
|
||||
version = "5.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "18hxwkdbfw0qs3p19jv6d8wwwdzb9m087891i8w2bzkn21fd5pmy";
|
||||
sha256 = "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "11.3";
|
||||
version = "12.0";
|
||||
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 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6";
|
||||
sha512 = "91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vis";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
sha256 = "1vhq6hprkgj90iwl5vl3pxs3xwc01mx8yhi6c1phzry5agqqp8jb";
|
||||
sha256 = "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh";
|
||||
repo = "vis";
|
||||
owner = "martanne";
|
||||
};
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avocode";
|
||||
version = "4.6.4";
|
||||
version = "4.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
|
||||
sha256 = "1hkqv2lix58my009i61cy0vpazxqpzapfhxkw5439ndn6qk1782d";
|
||||
sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm";
|
||||
};
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath (with xorg; [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, xorg, imlib2, libjpeg, libpng
|
||||
, curl, libexif, jpegexiforient, perlPackages }:
|
||||
, curl, libexif, jpegexiforient, perlPackages
|
||||
, enableAutoreload ? true }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
@ -21,7 +22,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}" "exif=1"
|
||||
] ++ optional stdenv.isDarwin "verscmp=0";
|
||||
] ++ optional stdenv.isDarwin "verscmp=0"
|
||||
++ optional enableAutoreload "inotify=1";
|
||||
|
||||
installTargets = [ "install" ];
|
||||
postInstall = ''
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goxel";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guillaumechereau";
|
||||
repo = "goxel";
|
||||
rev = "v${version}";
|
||||
sha256 = "1b63jqryq19qa81g1ml6d85f27wj1ci3h56r02cl9xn8di5p674f";
|
||||
sha256 = "1wmxy5wfk1xrqgz0y0zcr4vkddylqc70cv4vzk117x6whjnldsm3";
|
||||
};
|
||||
|
||||
patches = [ ./disable-imgui_ini.patch ];
|
||||
|
||||
@ -2,22 +2,24 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "krop";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminstraub";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr";
|
||||
sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyqt5
|
||||
pypdf2
|
||||
poppler-qt5
|
||||
libsForQt5.poppler
|
||||
ghostscript
|
||||
];
|
||||
buildInputs = [
|
||||
libsForQt5.poppler
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
makeWrapperArgs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "aminal";
|
||||
version = "0.8.6";
|
||||
version = "0.9.0";
|
||||
|
||||
goPackagePath = "github.com/liamg/aminal";
|
||||
|
||||
@ -30,7 +30,7 @@ buildGoPackage rec {
|
||||
owner = "liamg";
|
||||
repo = "aminal";
|
||||
rev = "v${version}";
|
||||
sha256 = "0qhjdckj2kr0vza6qssd9z8dfrsif1qxb1mal1d4wgdsy12lrmwl";
|
||||
sha256 = "0syv9md7blnl6i19zf8s1xjx5vfz6s755fxyg2ply0qc1pwhsj8n";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
||||
62
pkgs/applications/misc/hamster/default.nix
Normal file
62
pkgs/applications/misc/hamster/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ stdenv, fetchFromGitHub, python3Packages, intltool, glib, itstool
|
||||
, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "hamster";
|
||||
version = "3.0.2";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projecthamster";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09ikiwc2izjvwqbbyp8knn190x5y4anwslkmb9k2h3r3jwrg2vd2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.setuptools
|
||||
wrapGAppsHook
|
||||
intltool
|
||||
itstool
|
||||
wafHook
|
||||
glib
|
||||
gobject-introspection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pango
|
||||
gdk-pixbuf
|
||||
atk
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
pycairo
|
||||
pyxdg
|
||||
dbus-python
|
||||
];
|
||||
|
||||
# Setup hooks have trouble with strict deps.
|
||||
# https://github.com/NixOS/nixpkgs/issues/56943
|
||||
strictDeps = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/libexec "$out $pythonPath"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Time tracking application";
|
||||
homepage = "http://projecthamster.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.fabianhauser ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "heimer";
|
||||
version = "1.15.1";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "juzzlin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "13a9yfq7m8jhirb31i0mmigqb135r585zwqddknl090d88164fic";
|
||||
sha256 = "1sxdi1an9x62q9vwv7r2761my4dva6nc63n9861swxjjk18hmmar";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -19,5 +19,6 @@ mkDerivation rec {
|
||||
homepage = "https://github.com/juzzlin/Heimer";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "menumaker";
|
||||
version = "0.99.11";
|
||||
version = "0.99.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
|
||||
sha256 = "0dprndnhwm7b803zkp4pisiq06ic9iv8vr42in5is47jmvdim0wx";
|
||||
sha256 = "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "opentx";
|
||||
version = "2.3.7";
|
||||
version = "2.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentx";
|
||||
repo = "opentx";
|
||||
rev = "release/${version}";
|
||||
sha256 = "1wl3bk7s8h20dfys1hblzxc0br9zlwhcqlghgsbn81ki0xb6jmkf";
|
||||
sha256 = "0kh3jdy1pgvns8lrncf61ayaq0hmsv41j8xv4r4rf17zyvjl0qph";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -35,13 +35,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "orca";
|
||||
version = "3.36.2";
|
||||
version = "3.36.3";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g";
|
||||
sha256 = "1x0xrcyxlvcjlqp6wcsx5d951i500079wqs04scssjzwqggy330n";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
|
||||
, python3, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
|
||||
, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
|
||||
, removeReferencesTo
|
||||
|
||||
# optional packages-- override the variables ending in 'Support' to enable or
|
||||
# disable modules
|
||||
@ -74,6 +75,10 @@ stdenv.mkDerivation rec {
|
||||
'' else "";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake pkgconfig
|
||||
cmake pkgconfig removeReferencesTo
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
remove-references-to -t ${stdenv.cc} $out/bin/polybar
|
||||
'';
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "tut";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
|
||||
goPackagePath = "github.com/RasmusLindroth/tut";
|
||||
goDeps = ./deps.nix;
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
owner = "RasmusLindroth";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0wb5lf0zbhmg962p71bqlpyxn8f1n9fp1jh7y7fcg6w5mga8gqq3";
|
||||
sha256 = "19y6brw1d6dlp2gnkdpbp261662h5j46rmiqg73cxhrlws0y0kfk";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig";
|
||||
version = "5.11.2";
|
||||
version = "5.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mhqa9jb4475phhqnkc7k1mwgkan7zp7y4z2c7n2x43r48ghxpfx";
|
||||
sha256 = "019g64rp6g0b0w17bm9l4q5lh7szc6ai8r3bfmy98ngi929r4rl7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig-proxy";
|
||||
version = "5.10.2";
|
||||
version = "5.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig-proxy";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mkamkqhqj7nbvaxdim1rbc3f5sw410wzly4ln73ackzlvdwn319";
|
||||
sha256 = "0wwvsmanvcn0kbb5zqrj8786yg9rmdbink6rsnsm7ifak1iwvls9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
## various stuff that can be plugged in
|
||||
, flashplayer, hal-flash
|
||||
, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
|
||||
, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd
|
||||
, gnome3/*.gnome-shell*/
|
||||
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow
|
||||
, tridactyl-native
|
||||
@ -66,7 +66,7 @@ let
|
||||
++ extraNativeMessagingHosts
|
||||
);
|
||||
libs = lib.optionals stdenv.isLinux [ udev libva ]
|
||||
++ lib.optional ffmpegSupport ffmpeg_4
|
||||
++ lib.optional ffmpegSupport ffmpeg
|
||||
++ lib.optional gssSupport kerberos
|
||||
++ lib.optional gdkWayland libglvnd
|
||||
++ lib.optionals (cfg.enableQuakeLive or false)
|
||||
|
||||
@ -7,6 +7,9 @@
|
||||
, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, kerberos, libdrm, mesa
|
||||
|
||||
# Command line programs
|
||||
, coreutils
|
||||
|
||||
# command line arguments which are always set e.g "--disable-gpu"
|
||||
, commandLineArgs ? ""
|
||||
|
||||
@ -58,7 +61,7 @@ let
|
||||
liberation_ttf curl utillinux xdg_utils wget
|
||||
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
|
||||
bzip2 libcap at-spi2-atk at-spi2-core
|
||||
kerberos libdrm mesa
|
||||
kerberos libdrm mesa coreutils
|
||||
] ++ optional pulseSupport libpulseaudio
|
||||
++ [ gtk ];
|
||||
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jx";
|
||||
version = "2.1.31";
|
||||
version = "2.1.65";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jenkins-x";
|
||||
repo = "jx";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn";
|
||||
sha256 = "0zkp0z5qpqw44bjnl20xna7s251k7jsxccqnqkdqqrzmqjpkkwgx";
|
||||
};
|
||||
|
||||
vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s";
|
||||
vendorSha256 = "0zi2n8fywzy87yfwcx7di74s8mx0468zmg6kwjln7mwhr6q23adf";
|
||||
|
||||
subPackages = [ "cmd/jx" ];
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "kube-router";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
|
||||
goPackagePath = "github.com/cloudnativelabs/kube-router";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "cloudnativelabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "06azrghcxp6n4bvrqxpwhmg60qk4jqcrkl1lh1rardlzhl71lk1h";
|
||||
sha256 = "1g1y3l87a4il9g2yrl1ryx8xfd4x220azxhr3rxm5l9vhnnjwswa";
|
||||
};
|
||||
|
||||
buildFlagsArray = ''
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub, ... }:
|
||||
|
||||
let version = "0.13.1"; in
|
||||
let version = "0.16.0"; in
|
||||
|
||||
buildGoPackage {
|
||||
pname = "kubecfg";
|
||||
@ -10,7 +10,7 @@ buildGoPackage {
|
||||
owner = "bitnami";
|
||||
repo = "kubecfg";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x2mg13p8r1sgqr1bbzh57kfymb8z392y43djgks2agc7rjnd45f";
|
||||
sha256 = "1ipw7r9fyqbh1bjvk7ifmj3skh799ly90y4ph37r8mqk1wb92rz4";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/bitnami/kubecfg";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "kubeless";
|
||||
version = "1.0.4";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeless";
|
||||
repo = "kubeless";
|
||||
rev = "v${version}";
|
||||
sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040";
|
||||
sha256 = "1fcdyd1jf0yibfx9jc16m0vmazm2jymps92llh3vh5zqd36bxbyd";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/kubeless/kubeless";
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "terraform-provider-libvirt";
|
||||
version = "0.6.1";
|
||||
version = "0.6.2";
|
||||
|
||||
goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt";
|
||||
|
||||
@ -27,7 +27,7 @@ buildGoPackage rec {
|
||||
owner = "dmacvicar";
|
||||
repo = "terraform-provider-libvirt";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l2n97nj6g44n7bhnbjwmv36xi6754p4iq2qnpkdh39x4384a0zz";
|
||||
sha256 = "1wkpns047ccff0clfb1108wjax1qb5v06hky0i3h2wpzysll7r7b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
@ -5,8 +5,8 @@
|
||||
let
|
||||
# TODO: This package requires qt5Full to launch
|
||||
defaultOverrides = commonOverrides ++ [
|
||||
(mkOverride "jsonschema" "2.6.0"
|
||||
"00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
|
||||
(mkOverride "jsonschema" "3.2.0"
|
||||
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
|
||||
];
|
||||
|
||||
python = python3.override {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"name": "riot-desktop",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.6.4",
|
||||
"version": "1.6.5",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
@ -48,7 +48,7 @@
|
||||
"find-npm-prefix": "^1.0.2",
|
||||
"fs-extra": "^8.1.0",
|
||||
"glob": "^7.1.6",
|
||||
"matrix-js-sdk": "6.2.1",
|
||||
"matrix-js-sdk": "6.2.2",
|
||||
"mkdirp": "^1.0.3",
|
||||
"needle": "^2.3.2",
|
||||
"node-pre-gyp": "^0.14.0",
|
||||
|
||||
@ -3154,11 +3154,11 @@
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
|
||||
name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz";
|
||||
path = fetchurl {
|
||||
name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
|
||||
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz";
|
||||
sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b";
|
||||
name = "matrix_js_sdk___matrix_js_sdk_6.2.2.tgz";
|
||||
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.2.tgz";
|
||||
sha1 = "103d951f61945217b110962f55ae43996756f615";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
||||
@ -8,12 +8,12 @@
|
||||
|
||||
let
|
||||
executableName = "riot-desktop";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vector-im";
|
||||
repo = "riot-desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2";
|
||||
sha256 = "1snmfn98z63a8ahh5c7y7h00i8qsdq6wsnidmjjrkzcz3mchfq60";
|
||||
};
|
||||
electron = electron_7;
|
||||
|
||||
@ -78,7 +78,7 @@ in mkYarnPackage rec {
|
||||
description = "A feature-rich client for Matrix.org";
|
||||
homepage = "https://about.riot.im/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ pacien worldofpeace ma27 ];
|
||||
maintainers = teams.matrix.members;
|
||||
inherit (electron.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,11 +12,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "riot-web";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
|
||||
sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2";
|
||||
sha256 = "0mx7ql76cbivc0d9gzix51bc1rdp9yg9vjx05mbf5r9sxrwmihz5";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "A glossy Matrix collaboration client for the web";
|
||||
homepage = "http://riot.im/";
|
||||
maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ];
|
||||
maintainers = stdenv.lib.teams.matrix.members;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
hydraPlatforms = [];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ mkDerivation, lib, fetchurl, fetchsvn
|
||||
, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
|
||||
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
|
||||
, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
|
||||
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
|
||||
, tl-expected, hunspell
|
||||
# TODO: Shouldn't be required:
|
||||
, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
|
||||
@ -42,7 +42,7 @@ mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
|
||||
dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3
|
||||
dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3
|
||||
tl-expected hunspell
|
||||
# TODO: Shouldn't be required:
|
||||
pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
|
||||
|
||||
50
pkgs/applications/networking/mailreaders/meli/default.nix
Normal file
50
pkgs/applications/networking/mailreaders/meli/default.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchgit
|
||||
, rustPlatform
|
||||
, pkgconfig
|
||||
, openssl
|
||||
, dbus
|
||||
, sqlite
|
||||
, file
|
||||
, gzip
|
||||
, notmuch
|
||||
# Build with support for notmuch backend
|
||||
, withNotmuch ? true
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "meli";
|
||||
version = "alpha-0.5.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.meli.delivery/meli/meli.git";
|
||||
rev = version;
|
||||
sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv";
|
||||
};
|
||||
|
||||
cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y";
|
||||
|
||||
cargoBuildFlags = lib.optional withNotmuch "--features=notmuch";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gzip ];
|
||||
|
||||
buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch;
|
||||
|
||||
checkInputs = [ file ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/man/man1
|
||||
gzip < meli.1 > $out/share/man/man1/meli.1.gz
|
||||
mkdir -p $out/share/man/man5
|
||||
gzip < meli.conf.5 > $out/share/man/man5/meli.conf.5.gz
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults";
|
||||
homepage = "https://meli.delivery";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ maintainers."0x4A6F" matthiasbeyer erictapen ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitLab
|
||||
, meson, ninja, pkgconfig, scdoc
|
||||
, wayland, wayland-protocols, openssh
|
||||
, mesa, lz4, zstd, ffmpeg_4, libva
|
||||
, mesa, lz4, zstd, ffmpeg, libva
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
wayland wayland-protocols
|
||||
# Optional dependencies:
|
||||
mesa lz4 zstd ffmpeg_4 libva
|
||||
mesa lz4 zstd ffmpeg libva
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -31,6 +31,9 @@ in stdenv.mkDerivation {
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
];
|
||||
|
||||
# Avoid referencing -dev paths because of debug assertions.
|
||||
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison cmake flex pkgconfig
|
||||
] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
|
||||
@ -1,106 +0,0 @@
|
||||
{ stdenv, fetchurl, lib, makeWrapper,
|
||||
# build dependencies
|
||||
alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
|
||||
freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
|
||||
glibc, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
version = "2.12.0";
|
||||
|
||||
pname = "patchwork-classic";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ssbc/patchwork-classic-electron/releases/download/v2.12.0/ssb-patchwork-electron_2.12.0_linux-amd64.deb";
|
||||
sha256 = "1rvp07cgqwv7ac319p0qwpfxd7l8f53m1rlvvig7qf7q23fnmbsj";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
unpackCmd = ''
|
||||
ar p "$src" data.tar.xz | tar xJ
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -R usr/share opt $out/
|
||||
|
||||
# fix the path in the desktop file
|
||||
substituteInPlace \
|
||||
$out/share/applications/ssb-patchwork-electron.desktop \
|
||||
--replace /opt/ $out/opt/
|
||||
|
||||
# symlink the binary to bin/
|
||||
ln -s $out/opt/ssb-patchwork-electron/ssb-patchwork-electron $out/bin/patchwork-classic
|
||||
'';
|
||||
|
||||
|
||||
preFixup = let
|
||||
packages = [
|
||||
alsaLib
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
fontconfig
|
||||
freetype
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome2.GConf
|
||||
gnome2.gtk
|
||||
gnome2.pango
|
||||
nspr
|
||||
nss
|
||||
xorg.libX11
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXtst
|
||||
stdenv.cc.cc.lib
|
||||
stdenv.cc.cc
|
||||
glibc
|
||||
];
|
||||
libPathNative = lib.makeLibraryPath packages;
|
||||
libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
|
||||
libPath = "${libPathNative}:${libPath64}";
|
||||
in ''
|
||||
# patch executable
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${libPath}:$out/opt/ssb-patchwork-electron" \
|
||||
$out/opt/ssb-patchwork-electron/ssb-patchwork-electron
|
||||
|
||||
# patch libnode
|
||||
patchelf \
|
||||
--set-rpath "${libPath}" \
|
||||
$out/opt/ssb-patchwork-electron/libnode.so
|
||||
|
||||
# libffmpeg is for some reason not executable
|
||||
chmod a+x $out/opt/ssb-patchwork-electron/libffmpeg.so
|
||||
|
||||
# fix missing libudev
|
||||
ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/ssb-patchwork-electron/libudev.so.1
|
||||
wrapProgram $out/opt/ssb-patchwork-electron/ssb-patchwork-electron \
|
||||
--prefix LD_LIBRARY_PATH : $out/opt/ssb-patchwork-electron
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser";
|
||||
homepage = "https://github.com/ssbc/patchwork-classic-electron";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ mrVanDalo ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -13,11 +13,11 @@ let
|
||||
in
|
||||
mkDerivation rec {
|
||||
pname = "eagle";
|
||||
version = "9.6.1";
|
||||
version = "9.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz";
|
||||
sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw";
|
||||
sha256 = "18syygnskl286kn8aqfzzdsyzq59d2w19y1h1ynyxsnrvkyv71h0";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "verilator";
|
||||
version = "4.034";
|
||||
version = "4.036";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.veripool.org/ftp/${pname}-${version}.tgz";
|
||||
sha256 = "02xqvl9ic21jpda0xldh4ihqwl4ss8389s8fklgx5d98xq37pval";
|
||||
sha256 = "1sy02pgq3kvk8548l57hsh08vfbqdg8dghj8mwlybdi8fdjz4z1h";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -13,11 +13,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gitkraken";
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
|
||||
sha256 = "0ws1gb7fgy72s6hxkf9g16x565m58k1cdzx9ldcdghfffimz4cqx";
|
||||
sha256 = "0vj2ggbm617fypl69ksbrbl048xp4v6wc46y4sp7hrk6lg0gw1b0";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -8,11 +8,11 @@ let
|
||||
|
||||
in python3Packages.buildPythonApplication rec {
|
||||
pname = "mercurial";
|
||||
version = "5.3.1";
|
||||
version = "5.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
|
||||
sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp";
|
||||
sha256 = "1ilam0dz121nn4852jgkgyzyrvk3hn5cqnivy8gk1qg815mh4763";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ config, stdenv, fetchurl, fetchFromGitHub, fetchpatch
|
||||
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which
|
||||
, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
|
||||
, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs
|
||||
, nv-codec-headers, lua, libuchardet, libiconv ? null
|
||||
, CoreFoundation, Cocoa, CoreAudio, MediaPlayer
|
||||
|
||||
@ -39,7 +39,10 @@
|
||||
, libpngSupport ? true, libpng ? null
|
||||
, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null
|
||||
, rubberbandSupport ? stdenv.isLinux, rubberband ? null
|
||||
, sambaSupport ? stdenv.isLinux, samba ? null
|
||||
# NOTE: samba support should be removed on the next mpv release, see also:
|
||||
# https://github.com/NixOS/nixpkgs/pull/89145#issuecomment-636424362
|
||||
# Please remove this line on the next mpv release.
|
||||
, sambaSupport ? false, samba ? null
|
||||
, screenSaverSupport ? true, libXScrnSaver ? null
|
||||
, sdl2Support ? true, SDL2 ? null
|
||||
, sndioSupport ? true, sndio ? null
|
||||
@ -152,7 +155,7 @@ in stdenv.mkDerivation rec {
|
||||
++ optional swiftSupport swift;
|
||||
|
||||
buildInputs = [
|
||||
ffmpeg_4 freetype libass libpthreadstubs
|
||||
ffmpeg freetype libass libpthreadstubs
|
||||
luaEnv libuchardet mujs
|
||||
] ++ optional alsaSupport alsaLib
|
||||
++ optional archiveSupport libarchive
|
||||
|
||||
33
pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
Normal file
33
pkgs/applications/video/mpv/scripts/simple-mpv-webui.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-mpv-ui";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-dynaMIX";
|
||||
repo = "simple-mpv-webui";
|
||||
rev = "v${version}";
|
||||
sha256 = "1glrnnl1slcl0ri0zs4j64lc9aa52p9ffh6av0d81fk95nm98917";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r webui.lua webui-page $out/share/mpv/scripts/
|
||||
'';
|
||||
passthru.scriptName = "webui.lua";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A web based user interface with controls for the mpv mediaplayer";
|
||||
homepage = "https://github.com/open-dynaMIX/simple-mpv-webui";
|
||||
maintainers = [ maintainers.cript0nauta ];
|
||||
longDescription = ''
|
||||
You can access the webui when accessing http://127.0.0.1:8080 or
|
||||
http://[::1]:8080 in your webbrowser. By default it listens on
|
||||
0.0.0.0:8080 and [::0]:8080
|
||||
'';
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "tartube";
|
||||
version = "2.0.016";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axcore";
|
||||
repo = "tartube";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9";
|
||||
sha256 = "1klqjwqm29y2f6nc8gn222ykfvb5d64z1w2kifw9bq5bv0np9bda";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -35,6 +35,8 @@ python3Packages.buildPythonApplication rec {
|
||||
pygobject3
|
||||
pyxdg
|
||||
requests
|
||||
feedparser
|
||||
playsound
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -45,6 +47,10 @@ python3Packages.buildPythonApplication rec {
|
||||
pango
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i "/^\s*install_requires/s/, 'gi'\|'gi', \|'gi'//" setup.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{man/man1,applications,pixmaps}
|
||||
cp pack/tartube.1 $out/share/man/man1
|
||||
|
||||
@ -25,11 +25,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null && wra
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vlc";
|
||||
version = "3.0.10";
|
||||
version = "3.0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/vlc/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0cackl1084hcmg4myf3kvjvd6sjxmzn0c0qkmanz6brvgzyanrm9";
|
||||
sha256 = "06a9hfl60f6l0fs5c9ma5s8np8kscm4ala6m2pdfji9lyfna351y";
|
||||
};
|
||||
|
||||
# VLC uses a *ton* of libraries for various pieces of functionality, many of
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland, scdoc
|
||||
, wayland-protocols, ffmpeg_4, x264, libpulseaudio, ocl-icd, opencl-headers
|
||||
, wayland-protocols, ffmpeg, x264, libpulseaudio, ocl-icd, opencl-headers
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config wayland scdoc ];
|
||||
buildInputs = [
|
||||
wayland-protocols ffmpeg_4 x264 libpulseaudio ocl-icd opencl-headers
|
||||
wayland-protocols ffmpeg x264 libpulseaudio ocl-icd opencl-headers
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "conmon";
|
||||
version = "2.0.17";
|
||||
version = "2.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "01bicv0qr4aiahkw9cp6igk3jv1fqkbxmsp80nfvq6rxx873v0q7";
|
||||
sha256 = "0f32g048jamfhrds68vzirx8iqizr45wf2d4bfvdsk176amrj4k0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -8,11 +8,11 @@ assert withDoc -> asciidoc != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "herbstluftwm";
|
||||
version = "0.8.1";
|
||||
version = "0.8.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
|
||||
sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y";
|
||||
sha256 = "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
75
pkgs/applications/window-managers/hikari/default.nix
Normal file
75
pkgs/applications/window-managers/hikari/default.nix
Normal file
@ -0,0 +1,75 @@
|
||||
{ stdenv, fetchzip,
|
||||
pkgconfig, bmake,
|
||||
cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman,
|
||||
libucl, wayland, wayland-protocols, wlroots,
|
||||
features ? {
|
||||
gammacontrol = true;
|
||||
layershell = true;
|
||||
screencopy = true;
|
||||
xwayland = true;
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "hikari";
|
||||
version = "2.0.2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "1a3i01936pw11hrmjmrhzzwpndl1jqjgx376m5m724wd1j9awm68";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig bmake ];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
glib
|
||||
libevdev
|
||||
libinput
|
||||
libxkbcommon
|
||||
linux-pam
|
||||
pango
|
||||
pixman
|
||||
libucl
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Must replace GNU Make by bmake
|
||||
buildPhase = with stdenv.lib; concatStringsSep " " (
|
||||
[ "bmake" "-j$NIX_BUILD_CORES" "PREFIX=$out" ]
|
||||
++ optional stdenv.isLinux "WITH_POSIX_C_SOURCE=YES"
|
||||
++ mapAttrsToList (feat: enabled:
|
||||
optionalString enabled "WITH_${toUpper feat}=YES"
|
||||
) features
|
||||
);
|
||||
|
||||
# Can't suid in nix store
|
||||
# Run hikari as root (it will drop privileges as early as possible), or create
|
||||
# a systemd unit to give it the necessary permissions/capabilities.
|
||||
patchPhase = ''
|
||||
substituteInPlace Makefile --replace '4555' '555'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
bmake \
|
||||
PREFIX=$out \
|
||||
install
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Stacking Wayland compositor which is actively developed on FreeBSD but also supports Linux";
|
||||
homepage = "https://hikari.acmelabs.space";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux ++ platforms.freebsd;
|
||||
maintainers = with maintainers; [ jpotier ];
|
||||
};
|
||||
}
|
||||
@ -1,31 +1,45 @@
|
||||
{ stdenv, fetchFromGitHub, libpulseaudio, python3Packages, extraLibs ? [] }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, libpulseaudio
|
||||
, libnotify
|
||||
, gobject-introspection
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
, extraLibs ? [] }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
# i3pystatus moved to rolling release:
|
||||
# https://github.com/enkore/i3pystatus/issues/584
|
||||
version = "unstable-2019-06-10";
|
||||
version = "unstable-2020-06-12";
|
||||
pname = "i3pystatus";
|
||||
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
src = fetchFromGitHub {
|
||||
owner = "enkore";
|
||||
repo = "i3pystatus";
|
||||
rev = "56ce08d0ff8d5d64950d6b588ebede35a95e0ce2";
|
||||
sha256 = "12938860jbcly1xwhd71jvy2dff28pwv9kqh6mab1859148bzmcg";
|
||||
rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b";
|
||||
sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ keyring colour netifaces psutil basiciw ] ++
|
||||
[ libpulseaudio ] ++ extraLibs;
|
||||
buildInputs = [ libpulseaudio libnotify gobject-introspection ];
|
||||
|
||||
libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ];
|
||||
ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\"";
|
||||
# LC_TIME != C results in locale.Error: unsupported locale setting
|
||||
makeWrapperArgs = [ "--set LC_TIME C" ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
keyring colour netifaces psutil basiciw pygobject3
|
||||
] ++ extraLibs;
|
||||
|
||||
makeWrapperArgs = [
|
||||
# LC_TIME != C results in locale.Error: unsupported locale setting
|
||||
"--set" "LC_TIME" "C"
|
||||
"--suffix" "LD_LIBRARY_PATH" ":" "${stdenv.lib.makeLibraryPath [ libpulseaudio ]}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH")
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||
${ldWrapperSuffix}
|
||||
''${makeWrapperArgs[@]}
|
||||
'';
|
||||
|
||||
# no tests in tarball
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "icewm";
|
||||
version = "1.6.5";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbidulock";
|
||||
repo = "icewm";
|
||||
rev = version;
|
||||
sha256 = "1glzpkpl0vl5sjn1d9jlvwd9ch16dvxvsf2n310kb0ycpfkl84vs";
|
||||
sha256 = "05jg2gs5cdxn2kfm2y6yrqxpza5s1zsgb52168psmzhb4nakpv42";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig perl asciidoc ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "man-pages";
|
||||
version = "5.06";
|
||||
version = "5.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz";
|
||||
sha256 = "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h";
|
||||
sha256 = "13b3q7c67r0wkla4pdihl1qh09k67ms2z5jgzfqgpdqqy6mgziwd";
|
||||
};
|
||||
|
||||
makeFlags = [ "MANDIR=$(out)/share/man" ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.112";
|
||||
version = "0.113";
|
||||
|
||||
in fetchzip rec {
|
||||
name = "Amiri-${version}";
|
||||
|
||||
url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip";
|
||||
|
||||
sha256 = "13j8kglgca296czxjz1xvrbz6yx05s2xassiliyszndbkrhn6bkl";
|
||||
sha256 = "0v5xm4spyww8wy6j9kpb01ixrakw7wp6jng4xnh220iy6yqcxm7v";
|
||||
|
||||
postFetch = ''
|
||||
unzip $downloadedFile
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20200515";
|
||||
version = "20200529";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "1m9idmmb1sjf24lp9lgng2m1jj09mn9fa9pnz36fdv5q0lskgscj";
|
||||
sha256 = "0mbrf9j5wmjhc6jixvhp4jqyxixh1717lqrmzmipdg99xnzba81n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-code";
|
||||
version = "3.4.0";
|
||||
version = "3.4.1";
|
||||
|
||||
repoName = "code";
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "elementary";
|
||||
repo = repoName;
|
||||
rev = version;
|
||||
sha256 = "0b1vdgb1xvh5lqbral3r0qaq05zd5q5ywxw02fggpyy8nyxs3z8f";
|
||||
sha256 = "158zrzyyy507rxcbsb5am9768zbakpwrl61ixab57zla7z51l0g0";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
34
pkgs/development/compilers/dasm/default.nix
Normal file
34
pkgs/development/compilers/dasm/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dasm";
|
||||
version = "2.20.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dasm-assembler";
|
||||
repo = "dasm";
|
||||
rev = version;
|
||||
sha256 = "1nr4kvw42vyc6i4p1c06jlih11rhbjjxc27dc7cx5qj635xf4jcf";
|
||||
};
|
||||
|
||||
configurePhase = false;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
install bin/* $out/bin
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs ./test/
|
||||
'';
|
||||
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Assembler for 6502 and other 8-bit microprocessors";
|
||||
homepage = "https://dasm-assembler.github.io";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.jwatt ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -24,13 +24,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "1.0.3627";
|
||||
version = "1.0.4062";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
rev = "igc-${version}";
|
||||
sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8";
|
||||
sha256 = "1fr9mb7s5f0kiwxf04lqbyqbxfsvki0kwnpcy41m3p3la22mqz47";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang cmake bison flex llvm python ];
|
||||
|
||||
@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
|
||||
|
||||
propagatedBuildInputs = [glib];
|
||||
|
||||
configureFlags = [
|
||||
"--x-includes=${libX11.dev}/include"
|
||||
"--x-libraries=${libX11.out}/lib"
|
||||
|
||||
@ -18,19 +18,19 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "purescript";
|
||||
version = "0.13.6";
|
||||
version = "0.13.8";
|
||||
|
||||
src =
|
||||
if stdenv.isDarwin
|
||||
then
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "04kwjjrriyizpvhs96jgyx21ppyd1ynblk24i5825ywxlw9hja25";
|
||||
sha256 = "058w8w24g7xbdkn5l97jfj9dcg81vkfh3w8112anj982lynk6391";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
|
||||
sha256 = "012znrj32aq96qh1g2hscdvhl3flgihhimiz40agk0dykpksblns";
|
||||
sha256 = "01xb9sl6rmg02ypdrv4n0mkzmdr5y9rajcdmg9c3j46q7z6q9mxy";
|
||||
};
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "A strongly-typed functional programming language that compiles to JavaScript";
|
||||
homepage = "https://www.purescript.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ];
|
||||
maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ];
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rgbds";
|
||||
version = "0.3.10";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rednex";
|
||||
repo = "rgbds";
|
||||
rev = "v${version}";
|
||||
sha256 = "0752fbffxgxyf3jw2iij88l05dqhppgcxy7dvk82hp4wdg4cflpq";
|
||||
sha256 = "15680964nlsa83nqgxk7knxajn98lddz2hg6jnn8ffmnms5wdam7";
|
||||
};
|
||||
nativeBuildInputs = [ bison flex pkg-config libpng ];
|
||||
installFlags = [ "PREFIX=\${out}" ];
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yosys";
|
||||
version = "2020.06.11";
|
||||
version = "2020.06.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YosysHQ";
|
||||
repo = "yosys";
|
||||
rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d";
|
||||
sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp";
|
||||
rev = "39ba90a8b84d740b670a9f1df5148b824d441c63";
|
||||
sha256 = "1ncscbhyq4f07d28l32j37y5d84vyqxfx0fbzhb7nzfhplk8hh0s";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -1,26 +1,17 @@
|
||||
{ buildDhallPackage, fetchFromGitHub, lib }:
|
||||
{ buildDhallGitHubPackage, lib }:
|
||||
|
||||
let
|
||||
makePrelude =
|
||||
version:
|
||||
lib.makeOverridable
|
||||
( { rev, sha256, file ? "package.dhall" }:
|
||||
buildDhallPackage {
|
||||
name = "Prelude-${version}";
|
||||
version: { rev, sha256 }:
|
||||
buildDhallGitHubPackage {
|
||||
name = "Prelude-${version}";
|
||||
owner = "dhall-lang";
|
||||
repo = "dhall-lang";
|
||||
directory = "Prelude";
|
||||
file = "package.dhall";
|
||||
|
||||
code =
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhall-lang";
|
||||
repo = "dhall-lang";
|
||||
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
in
|
||||
"${src}/Prelude/${file}";
|
||||
}
|
||||
);
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
in
|
||||
lib.mapAttrs makePrelude {
|
||||
|
||||
@ -1,29 +1,16 @@
|
||||
{ buildDhallPackage, fetchFromGitHub, lib }:
|
||||
{ buildDhallGitHubPackage, lib }:
|
||||
|
||||
let
|
||||
makeDhallKubernetes =
|
||||
version:
|
||||
lib.makeOverridable
|
||||
( { rev
|
||||
, sha256
|
||||
, file ? "package.dhall"
|
||||
}:
|
||||
buildDhallPackage {
|
||||
name = "dhall-kubernetes-${version}";
|
||||
version: { rev, sha256 }:
|
||||
buildDhallGitHubPackage {
|
||||
name = "dhall-kubernetes-${version}";
|
||||
owner = "dhall-lang";
|
||||
repo = "dhall-kubernetes";
|
||||
file = "package.dhall";
|
||||
|
||||
code =
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhall-lang";
|
||||
repo = "dhall-kubernetes";
|
||||
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
in
|
||||
"${src}/${file}";
|
||||
}
|
||||
);
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
in
|
||||
lib.mapAttrs makeDhallKubernetes {
|
||||
|
||||
@ -1,47 +1,32 @@
|
||||
{ buildDhallPackage, dhall-kubernetes, fetchFromGitHub, lib, Prelude }:
|
||||
{ buildDhallGitHubPackage, dhall-kubernetes, lib, Prelude }:
|
||||
|
||||
let
|
||||
makeDhallPackages =
|
||||
version:
|
||||
lib.makeOverridable
|
||||
( { rev
|
||||
, sha256
|
||||
, dependencies
|
||||
}:
|
||||
buildDhallPackage {
|
||||
name = "dhall-packages-${version}";
|
||||
version: { rev, sha256, dependencies }:
|
||||
buildDhallGitHubPackage {
|
||||
name = "dhall-packages-${version}";
|
||||
owner = "EarnestResearch";
|
||||
repo = "dhall-packages";
|
||||
file = "package.dhall";
|
||||
|
||||
inherit dependencies;
|
||||
|
||||
code =
|
||||
let
|
||||
src = fetchFromGitHub {
|
||||
owner = "EarnestResearch";
|
||||
repo = "dhall-packages";
|
||||
|
||||
inherit rev sha256;
|
||||
};
|
||||
|
||||
in
|
||||
"${src}/package.dhall";
|
||||
}
|
||||
);
|
||||
inherit rev sha256 dependencies;
|
||||
};
|
||||
|
||||
in
|
||||
lib.mapAttrs makeDhallPackages {
|
||||
"0.11.1" =
|
||||
let
|
||||
k8s_6a47bd = dhall-kubernetes."3.0.0".override {
|
||||
k8s_6a47bd = dhall-kubernetes.override {
|
||||
rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4";
|
||||
sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh";
|
||||
};
|
||||
|
||||
k8s_4ad581 = dhall-kubernetes."3.0.0".override {
|
||||
k8s_4ad581 = dhall-kubernetes.override {
|
||||
rev = "4ad58156b7fdbbb6da0543d8b314df899feca077";
|
||||
sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0";
|
||||
};
|
||||
|
||||
k8s_fee24c = dhall-kubernetes."3.0.0".override {
|
||||
k8s_fee24c = dhall-kubernetes.override {
|
||||
rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d";
|
||||
sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk";
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#
|
||||
# if vendorSha256 is null, then we won't fetch any dependencies and
|
||||
# rely on the vendor folder within the source.
|
||||
, vendorSha256 ? null
|
||||
, vendorSha256
|
||||
# Whether to delete the vendor folder supplied with the source.
|
||||
, deleteVendor ? false
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-cairo";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz";
|
||||
sha256 = "11fn2x2973dizzw94fkz6rj9crsyzchphq5097lvbkvqpzbyidyp";
|
||||
sha256 = "1gc642r9ndsjhhmh9bl5cbd3dwvy4dpxwhr0zpsw43y9nmz37xpl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
{ buildDhallPackage, lib }:
|
||||
|
||||
# This is a minor variation on `buildDhallPackage` that splits the `code`
|
||||
# argument into `src` and `file` in such a way that you can easily override
|
||||
# the `file`
|
||||
#
|
||||
# This function is used by `dhall-to-nixpkgs` when given a directory
|
||||
lib.makeOverridable
|
||||
( { # Arguments passed through to `buildDhallPackage`
|
||||
name
|
||||
, dependencies ? []
|
||||
, source ? false
|
||||
|
||||
, src
|
||||
, # The file to import, relative to the root directory
|
||||
file ? "package.dhall"
|
||||
}:
|
||||
|
||||
buildDhallPackage {
|
||||
inherit name dependencies source;
|
||||
|
||||
code = "${src}/${file}";
|
||||
}
|
||||
)
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
{ buildDhallPackage, fetchFromGitHub, lib }:
|
||||
|
||||
# This function is used by `dhall-to-nixpkgs` when given a GitHub repository
|
||||
lib.makeOverridable
|
||||
( { # Arguments passed through to `buildDhallPackage`
|
||||
name
|
||||
, dependencies ? []
|
||||
, source ? false
|
||||
|
||||
, # The directory containing the Dhall files, if other than the root of the
|
||||
# repository
|
||||
directory ? ""
|
||||
, # The file to import, relative to the above directory
|
||||
file ? "package.dhall"
|
||||
|
||||
# Arguments passed through to `fetchFromGitHub`
|
||||
, owner
|
||||
, repo
|
||||
, rev
|
||||
# Extra arguments passed through to `fetchFromGitHub`, such as the hash
|
||||
# or `fetchSubmodules`
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
buildDhallPackage {
|
||||
inherit name dependencies source;
|
||||
|
||||
code =
|
||||
let
|
||||
src = fetchFromGitHub ({
|
||||
name = "${name}-source";
|
||||
|
||||
inherit owner repo rev;
|
||||
} // removeAttrs args [
|
||||
"name"
|
||||
"dependencies"
|
||||
"source"
|
||||
"directory"
|
||||
"file"
|
||||
"owner"
|
||||
"repo"
|
||||
"rev"
|
||||
]);
|
||||
|
||||
prefix = lib.optionalString (directory != "") "${directory}/";
|
||||
|
||||
in
|
||||
"${src}/${prefix}${file}";
|
||||
}
|
||||
)
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "janet";
|
||||
version = "1.9.1";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "janet-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1zdiwddnppwg5zrizy2ypd449zj4mivib76h73xhvr1syl7dk7sc";
|
||||
sha256 = "0kx3c4v0481b4xx239w10ajwp8ngq8smxzh3m77dazd89r997n1g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja ];
|
||||
|
||||
@ -165,6 +165,9 @@ let
|
||||
# Python packages built through cross-compilation are always for the host platform.
|
||||
disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonForBuild ];
|
||||
|
||||
# For now, revert recompilation of bytecode.
|
||||
dontUsePythonRecompileBytecode = true;
|
||||
|
||||
meta = {
|
||||
# default to python's platforms
|
||||
platforms = python.meta.platforms;
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-activemq";
|
||||
version = "5.15.12";
|
||||
version = "5.15.13";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "14v117r9zqvrqr79h66r0dm9lyxq3104rcdizcnvk0syz0zbwps1";
|
||||
sha256 = "1hzapnd0lbiid243xiaz8kv67al8griccjj4dabml62hqhrk9k96";
|
||||
url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz";
|
||||
};
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmysofa";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${version}";
|
||||
sha256 = "053inxfl2n6wdgvnn02kf63m92r48ch4wqix9mqf3rgcf1bfkyfa";
|
||||
sha256 = "12jzap5fh0a1fmfy4z8z4kjjlwi0qzdb9z59ijdlyqdzwxnzkccx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cimg";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtschump";
|
||||
repo = "CImg";
|
||||
rev = "v.${version}";
|
||||
sha256 = "1x43c1w2kzr6h3j7y3kwiwb7nba0iymck6bq9psvp53mh9xxrfd1";
|
||||
sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpp-hocon";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3";
|
||||
sha256 = "1c8zy4hi0182k0vfx5l8bjq1iv7lvvw1zi4vy3429s898rx7z3d3";
|
||||
rev = version;
|
||||
repo = "cpp-hocon";
|
||||
owner = "puppetlabs";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "curlcpp";
|
||||
version = "1.1";
|
||||
version = "1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "JosephP91";
|
||||
repo = "curlcpp";
|
||||
rev = version;
|
||||
sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5";
|
||||
sha256 = "1zx76jcddqk4zkcdb6p7rsmkjbbjm2cj6drj0c8hdd61ms1d0f3n";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake curl ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user