Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
commit
11a9ac00fc
157 changed files with 1479 additions and 591 deletions
1
.github/CODEOWNERS
vendored
1
.github/CODEOWNERS
vendored
|
|
@ -46,6 +46,7 @@
|
|||
/nixos/default.nix @nbp @infinisil
|
||||
/nixos/lib/from-env.nix @nbp @infinisil
|
||||
/nixos/lib/eval-config.nix @nbp @infinisil
|
||||
/nixos/doc @ryantm
|
||||
/nixos/doc/manual/configuration/abstractions.xml @nbp
|
||||
/nixos/doc/manual/configuration/config-file.xml @nbp
|
||||
/nixos/doc/manual/configuration/config-syntax.xml @nbp
|
||||
|
|
|
|||
20
.github/workflows/nixos-manual.yml
vendored
Normal file
20
.github/workflows/nixos-manual.yml
vendored
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
name: NixOS manual checks
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches-ignore:
|
||||
- 'release-**'
|
||||
paths:
|
||||
- 'nixos/**/*.xml'
|
||||
- 'nixos/**/*.md'
|
||||
|
||||
jobs:
|
||||
tests:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: cachix/install-nix-action@v12
|
||||
- name: Check DocBook files generated from Markdown are consistent
|
||||
run: |
|
||||
nixos/doc/manual/md-to-db.sh
|
||||
git diff --exit-code
|
||||
2
.version
2
.version
|
|
@ -1 +1 @@
|
|||
21.05
|
||||
21.11
|
||||
|
|
@ -171,7 +171,7 @@ rec {
|
|||
On each release the first letter is bumped and a new animal is chosen
|
||||
starting with that new letter.
|
||||
*/
|
||||
codeName = "Okapi";
|
||||
codeName = "Porcupine";
|
||||
|
||||
/* Returns the current nixpkgs version suffix as string. */
|
||||
versionSuffix =
|
||||
|
|
|
|||
|
|
@ -5696,6 +5696,12 @@
|
|||
githubId = 6652840;
|
||||
name = "Jade";
|
||||
};
|
||||
lgcl = {
|
||||
email = "dev@lgcl.de";
|
||||
name = "Leon Vack";
|
||||
github = "LogicalOverflow";
|
||||
githubId = 5919957;
|
||||
};
|
||||
lheckemann = {
|
||||
email = "git@sphalerite.org";
|
||||
github = "lheckemann";
|
||||
|
|
@ -6452,10 +6458,10 @@
|
|||
email = "softs@metabarcoding.org";
|
||||
name = "Celine Mercier";
|
||||
};
|
||||
metadark = {
|
||||
kira-bruneau = {
|
||||
email = "kira.bruneau@pm.me";
|
||||
name = "Kira Bruneau";
|
||||
github = "metadark";
|
||||
github = "kira-bruneau";
|
||||
githubId = 382041;
|
||||
};
|
||||
meutraa = {
|
||||
|
|
|
|||
13
nixos/doc/manual/contributing-to-this-manual.chapter.md
Normal file
13
nixos/doc/manual/contributing-to-this-manual.chapter.md
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# Contributing to this manual {#chap-contributing}
|
||||
|
||||
The DocBook and CommonMark sources of NixOS' manual are in the [nixos/doc/manual](https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual) subdirectory of the [Nixpkgs](https://github.com/NixOS/nixpkgs) repository.
|
||||
|
||||
You can quickly check your edits with the following:
|
||||
|
||||
```ShellSession
|
||||
$ cd /path/to/nixpkgs
|
||||
$ ./nixos/doc/manual/md-to-db.sh
|
||||
$ nix-build nixos/release.nix -A manual.x86_64-linux
|
||||
```
|
||||
|
||||
If the build succeeds, the manual will be in `./result/share/doc/nixos/index.html`.
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xml:id="chap-contributing">
|
||||
<title>Contributing to this manual</title>
|
||||
<para>
|
||||
The DocBook sources of NixOS' manual are in the <filename
|
||||
xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">
|
||||
nixos/doc/manual</filename> subdirectory of the <link
|
||||
xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link> repository.
|
||||
</para>
|
||||
<para>
|
||||
You can quickly check your edits with the following:
|
||||
</para>
|
||||
<screen>
|
||||
<prompt>$ </prompt>cd /path/to/nixpkgs
|
||||
<prompt>$ </prompt>nix-build nixos/release.nix -A manual.x86_64-linux
|
||||
</screen>
|
||||
<para>
|
||||
If the build succeeds, the manual will be in
|
||||
<filename>./result/share/doc/nixos/index.html</filename>.
|
||||
</para>
|
||||
</chapter>
|
||||
18
nixos/doc/manual/development/building-nixos.chapter.md
Normal file
18
nixos/doc/manual/development/building-nixos.chapter.md
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Building Your Own NixOS CD {#sec-building-cd}
|
||||
Building a NixOS CD is as easy as configuring your own computer. The idea is to use another module which will replace your `configuration.nix` to configure the system that would be installed on the CD.
|
||||
|
||||
Default CD/DVD configurations are available inside `nixos/modules/installer/cd-dvd`
|
||||
|
||||
```ShellSession
|
||||
$ git clone https://github.com/NixOS/nixpkgs.git
|
||||
$ cd nixpkgs/nixos
|
||||
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
|
||||
```
|
||||
|
||||
Before burning your CD/DVD, you can check the content of the image by mounting anywhere like suggested by the following command:
|
||||
|
||||
```ShellSession
|
||||
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
|
||||
```
|
||||
|
||||
If you want to customize your NixOS CD in more detail, or generate other kinds of images, you might want to check out [nixos-generators](https://github.com/nix-community/nixos-generators). This can also be a good starting point when you want to use Nix to build a 'minimal' image that doesn't include a NixOS installation.
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<chapter xmlns="http://docbook.org/ns/docbook"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude"
|
||||
version="5.0"
|
||||
xml:id="sec-building-cd">
|
||||
<title>Building Your Own NixOS CD</title>
|
||||
<para>
|
||||
Building a NixOS CD is as easy as configuring your own computer. The idea is
|
||||
to use another module which will replace your
|
||||
<filename>configuration.nix</filename> to configure the system that would be
|
||||
installed on the CD.
|
||||
</para>
|
||||
<para>
|
||||
Default CD/DVD configurations are available inside
|
||||
<filename>nixos/modules/installer/cd-dvd</filename>.
|
||||
<screen>
|
||||
<prompt>$ </prompt>git clone https://github.com/NixOS/nixpkgs.git
|
||||
<prompt>$ </prompt>cd nixpkgs/nixos
|
||||
<prompt>$ </prompt>nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
|
||||
</para>
|
||||
<para>
|
||||
Before burning your CD/DVD, you can check the content of the image by
|
||||
mounting anywhere like suggested by the following command:
|
||||
<screen>
|
||||
<prompt># </prompt>mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
|
||||
</para>
|
||||
<para>
|
||||
If you want to customize your NixOS CD in more detail, or generate other kinds
|
||||
of images, you might want to check out <link
|
||||
xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link>. This can also be a good starting point when you want to use Nix to build a
|
||||
'minimal' image that doesn't include a NixOS installation.
|
||||
</para>
|
||||
</chapter>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<xi:include href="writing-modules.xml" />
|
||||
<xi:include href="building-parts.xml" />
|
||||
<xi:include href="writing-documentation.xml" />
|
||||
<xi:include href="building-nixos.xml" />
|
||||
<xi:include href="../from_md/development/building-nixos.chapter.xml" />
|
||||
<xi:include href="nixos-tests.xml" />
|
||||
<xi:include href="testing-installer.xml" />
|
||||
<xi:include href="releases.xml" />
|
||||
|
|
|
|||
5
nixos/doc/manual/from_md/README.md
Normal file
5
nixos/doc/manual/from_md/README.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
This directory is temporarily needed while we transition the manual to CommonMark. It stores the output of the ../md-to-db.sh script that converts CommonMark files back to DocBook.
|
||||
|
||||
We are choosing to convert the Markdown to DocBook at authoring time instead of manual building time, because we do not want the pandoc toolchain to become part of the NixOS closure.
|
||||
|
||||
Do not edit the DocBook files inside this directory or its subdirectories. Instead, edit the corresponding .md file in the normal manual directories, and run ../md-to-db.sh to update the file here.
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-contributing">
|
||||
<title>Contributing to this manual</title>
|
||||
<para>
|
||||
The DocBook and CommonMark sources of NixOS’ manual are in the
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual">nixos/doc/manual</link>
|
||||
subdirectory of the
|
||||
<link xlink:href="https://github.com/NixOS/nixpkgs">Nixpkgs</link>
|
||||
repository.
|
||||
</para>
|
||||
<para>
|
||||
You can quickly check your edits with the following:
|
||||
</para>
|
||||
<programlisting>
|
||||
$ cd /path/to/nixpkgs
|
||||
$ ./nixos/doc/manual/md-to-db.sh
|
||||
$ nix-build nixos/release.nix -A manual.x86_64-linux
|
||||
</programlisting>
|
||||
<para>
|
||||
If the build succeeds, the manual will be in
|
||||
<literal>./result/share/doc/nixos/index.html</literal>.
|
||||
</para>
|
||||
</chapter>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-building-cd">
|
||||
<title>Building Your Own NixOS CD</title>
|
||||
<para>
|
||||
Building a NixOS CD is as easy as configuring your own computer. The
|
||||
idea is to use another module which will replace your
|
||||
<literal>configuration.nix</literal> to configure the system that
|
||||
would be installed on the CD.
|
||||
</para>
|
||||
<para>
|
||||
Default CD/DVD configurations are available inside
|
||||
<literal>nixos/modules/installer/cd-dvd</literal>
|
||||
</para>
|
||||
<programlisting>
|
||||
$ git clone https://github.com/NixOS/nixpkgs.git
|
||||
$ cd nixpkgs/nixos
|
||||
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix
|
||||
</programlisting>
|
||||
<para>
|
||||
Before burning your CD/DVD, you can check the content of the image
|
||||
by mounting anywhere like suggested by the following command:
|
||||
</para>
|
||||
<programlisting>
|
||||
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
|
||||
</programlisting>
|
||||
<para>
|
||||
If you want to customize your NixOS CD in more detail, or generate
|
||||
other kinds of images, you might want to check out
|
||||
<link xlink:href="https://github.com/nix-community/nixos-generators">nixos-generators</link>.
|
||||
This can also be a good starting point when you want to use Nix to
|
||||
build a <quote>minimal</quote> image that doesn’t include a NixOS
|
||||
installation.
|
||||
</para>
|
||||
</chapter>
|
||||
15
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
Normal file
15
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="release-21.11">
|
||||
<title>Release 21.11 (<quote>?</quote>, 2021.11/??)</title>
|
||||
<para>
|
||||
In addition to numerous new and upgraded packages, this release has
|
||||
the following highlights:
|
||||
</para>
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Support is planned until the end of April 2022, handing over to
|
||||
22.05.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
|
@ -19,6 +19,6 @@
|
|||
<xi:include href="./generated/options-db.xml"
|
||||
xpointer="configuration-variable-list" />
|
||||
</appendix>
|
||||
<xi:include href="contributing-to-this-manual.xml" />
|
||||
<xi:include href="./from_md/contributing-to-this-manual.chapter.xml" />
|
||||
<xi:include href="release-notes/release-notes.xml" />
|
||||
</book>
|
||||
|
|
|
|||
33
nixos/doc/manual/md-to-db.sh
Executable file
33
nixos/doc/manual/md-to-db.sh
Executable file
|
|
@ -0,0 +1,33 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p pandoc
|
||||
|
||||
# This script is temporarily needed while we transition the manual to
|
||||
# CommonMark. It converts the .md files in the regular manual folder
|
||||
# into DocBook files in the from_md folder.
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
pushd $DIR
|
||||
|
||||
OUT="$DIR/from_md"
|
||||
mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$')
|
||||
|
||||
for mf in ${MD_FILES[*]}; do
|
||||
if [ "${mf: -11}" == ".section.md" ]; then
|
||||
mkdir -p $(dirname "$OUT/$mf")
|
||||
pandoc "$mf" -t docbook \
|
||||
--extract-media=media \
|
||||
-f markdown+smart \
|
||||
| cat > "$OUT/${mf%".section.md"}.section.xml"
|
||||
fi
|
||||
|
||||
if [ "${mf: -11}" == ".chapter.md" ]; then
|
||||
mkdir -p $(dirname "$OUT/$mf")
|
||||
pandoc "$mf" -t docbook \
|
||||
--top-level-division=chapter \
|
||||
--extract-media=media \
|
||||
-f markdown+smart \
|
||||
| cat > "$OUT/${mf%".chapter.md"}.chapter.xml"
|
||||
fi
|
||||
done
|
||||
|
||||
popd
|
||||
|
|
@ -8,6 +8,7 @@
|
|||
This section lists the release notes for each stable version of NixOS and
|
||||
current unstable revision.
|
||||
</para>
|
||||
<xi:include href="../from_md/release-notes/rl-2111.section.xml" />
|
||||
<xi:include href="rl-2105.xml" />
|
||||
<xi:include href="rl-2009.xml" />
|
||||
<xi:include href="rl-2003.xml" />
|
||||
|
|
|
|||
5
nixos/doc/manual/release-notes/rl-2111.section.md
Normal file
5
nixos/doc/manual/release-notes/rl-2111.section.md
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# Release 21.11 (“?”, 2021.11/??) {#release-21.11}
|
||||
|
||||
In addition to numerous new and upgraded packages, this release has the following highlights:
|
||||
|
||||
* Support is planned until the end of April 2022, handing over to 22.05.
|
||||
|
|
@ -24,6 +24,6 @@ in
|
|||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -238,6 +238,7 @@
|
|||
./services/amqp/activemq/default.nix
|
||||
./services/amqp/rabbitmq.nix
|
||||
./services/audio/alsa.nix
|
||||
./services/audio/botamusique.nix
|
||||
./services/audio/jack.nix
|
||||
./services/audio/icecast.nix
|
||||
./services/audio/jmusicbot.nix
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ in
|
|||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
114
nixos/modules/services/audio/botamusique.nix
Normal file
114
nixos/modules/services/audio/botamusique.nix
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.botamusique;
|
||||
|
||||
format = pkgs.formats.ini {};
|
||||
configFile = format.generate "botamusique.ini" cfg.settings;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with lib.maintainers; [ hexa ];
|
||||
|
||||
options.services.botamusique = {
|
||||
enable = mkEnableOption "botamusique, a bot to play audio streams on mumble";
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.botamusique;
|
||||
description = "The botamusique package to use.";
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = with types; submodule {
|
||||
freeformType = format.type;
|
||||
options = {
|
||||
server.host = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
example = "mumble.example.com";
|
||||
description = "Hostname of the mumble server to connect to.";
|
||||
};
|
||||
|
||||
server.port = mkOption {
|
||||
type = types.port;
|
||||
default = 64738;
|
||||
description = "Port of the mumble server to connect to.";
|
||||
};
|
||||
|
||||
bot.username = mkOption {
|
||||
type = types.str;
|
||||
default = "botamusique";
|
||||
description = "Name the bot should appear with.";
|
||||
};
|
||||
|
||||
bot.comment = mkOption {
|
||||
type = types.str;
|
||||
default = "Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun!";
|
||||
description = "Comment displayed for the bot.";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
description = ''
|
||||
Your <filename>configuration.ini</filename> as a Nix attribute set. Look up
|
||||
possible options in the <link xlink:href="https://github.com/azlux/botamusique/blob/master/configuration.example.ini">configuration.example.ini</link>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.botamusique = {
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
unitConfig.Documentation = "https://github.com/azlux/botamusique/wiki";
|
||||
|
||||
environment.HOME = "/var/lib/botamusique";
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/botamusique --config ${configFile}";
|
||||
Restart = "always"; # the bot exits when the server connection is lost
|
||||
|
||||
# Hardening
|
||||
CapabilityBoundingSet = [ "" ];
|
||||
DynamicUser = true;
|
||||
IPAddressDeny = [
|
||||
"link-local"
|
||||
"multicast"
|
||||
];
|
||||
LockPersonality = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
ProcSubset = "pid";
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
PrivateTmp = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "strict";
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
StateDirectory = "botamusique";
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"~@privileged"
|
||||
"~@resources"
|
||||
];
|
||||
UMask = "0077";
|
||||
WorkingDirectory = "/var/lib/botamusique";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -197,14 +197,14 @@ in {
|
|||
])) (attrValues cfg.commands);
|
||||
after = [ "zfs.target" ];
|
||||
serviceConfig = {
|
||||
ExecStartPre = (map (pool: lib.escapeShellArgs [
|
||||
"+/run/booted-system/sw/bin/zfs" "allow"
|
||||
cfg.user "hold,send" pool
|
||||
]) (getPools "source")) ++
|
||||
(map (pool: lib.escapeShellArgs [
|
||||
"+/run/booted-system/sw/bin/zfs" "allow"
|
||||
cfg.user "create,mount,receive,rollback" pool
|
||||
]) (getPools "target"));
|
||||
ExecStartPre = let
|
||||
allowCmd = permissions: pool: lib.escapeShellArgs [
|
||||
"+/run/booted-system/sw/bin/zfs" "allow"
|
||||
cfg.user (concatStringsSep "," permissions) pool
|
||||
];
|
||||
in
|
||||
(map (allowCmd [ "hold" "send" "snapshot" "destroy" ]) (getPools "source")) ++
|
||||
(map (allowCmd [ "create" "mount" "receive" "rollback" ]) (getPools "target"));
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -699,12 +699,12 @@ in {
|
|||
];
|
||||
|
||||
users.users.matrix-synapse = {
|
||||
group = "matrix-synapse";
|
||||
home = cfg.dataDir;
|
||||
createHome = true;
|
||||
shell = "${pkgs.bash}/bin/bash";
|
||||
uid = config.ids.uids.matrix-synapse;
|
||||
};
|
||||
group = "matrix-synapse";
|
||||
home = cfg.dataDir;
|
||||
createHome = true;
|
||||
shell = "${pkgs.bash}/bin/bash";
|
||||
uid = config.ids.uids.matrix-synapse;
|
||||
};
|
||||
|
||||
users.groups.matrix-synapse = {
|
||||
gid = config.ids.gids.matrix-synapse;
|
||||
|
|
@ -726,6 +726,10 @@ in {
|
|||
User = "matrix-synapse";
|
||||
Group = "matrix-synapse";
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" ''
|
||||
chown matrix-synapse:matrix-synapse ${cfg.dataDir}/homeserver.signing.key
|
||||
chmod 0600 ${cfg.dataDir}/homeserver.signing.key
|
||||
'')) ];
|
||||
ExecStart = ''
|
||||
${cfg.package}/bin/homeserver \
|
||||
${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) }
|
||||
|
|
@ -733,6 +737,7 @@ in {
|
|||
'';
|
||||
ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID";
|
||||
Restart = "on-failure";
|
||||
UMask = "0077";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ in
|
|||
cinnamon-session
|
||||
cinnamon-desktop
|
||||
cinnamon-menus
|
||||
cinnamon-translations
|
||||
|
||||
# utils needed by some scripts
|
||||
killall
|
||||
|
|
@ -137,6 +138,9 @@ in
|
|||
# cinnamon-killer-daemon: provided by cinnamon-common
|
||||
gnome.networkmanagerapplet # session requirement - also nm-applet not needed
|
||||
|
||||
# For a polkit authentication agent
|
||||
polkit_gnome
|
||||
|
||||
# packages
|
||||
nemo
|
||||
cinnamon-control-center
|
||||
|
|
|
|||
|
|
@ -316,6 +316,7 @@ in
|
|||
++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt pkgs.openobex pkgs.obexftp ]
|
||||
++ lib.optional config.networking.networkmanager.enable plasma-nm
|
||||
++ lib.optional config.hardware.pulseaudio.enable plasma-pa
|
||||
++ lib.optional config.services.pipewire.pulse.enable plasma-pa
|
||||
++ lib.optional config.powerManagement.enable powerdevil
|
||||
++ lib.optional config.services.colord.enable pkgs.colord-kde
|
||||
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]
|
||||
|
|
|
|||
|
|
@ -428,7 +428,7 @@ let
|
|||
extraVeths = {};
|
||||
additionalCapabilities = [];
|
||||
ephemeral = false;
|
||||
timeoutStartSec = "15s";
|
||||
timeoutStartSec = "1min";
|
||||
allowedDevices = [];
|
||||
hostAddress = null;
|
||||
hostAddress6 = null;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ in
|
|||
boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64
|
||||
boot-stage1 = handleTest ./boot-stage1.nix {};
|
||||
borgbackup = handleTest ./borgbackup.nix {};
|
||||
botamusique = handleTest ./botamusique.nix {};
|
||||
buildbot = handleTest ./buildbot.nix {};
|
||||
buildkite-agents = handleTest ./buildkite-agents.nix {};
|
||||
caddy = handleTest ./caddy.nix {};
|
||||
|
|
|
|||
47
nixos/tests/botamusique.nix
Normal file
47
nixos/tests/botamusique.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ...} :
|
||||
|
||||
{
|
||||
name = "botamusique";
|
||||
meta.maintainers = with lib.maintainers; [ hexa ];
|
||||
|
||||
nodes = {
|
||||
machine = { config, ... }: {
|
||||
services.murmur = {
|
||||
enable = true;
|
||||
registerName = "NixOS tests";
|
||||
};
|
||||
|
||||
services.botamusique = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server = {
|
||||
channel = "NixOS tests";
|
||||
};
|
||||
bot = {
|
||||
version = false;
|
||||
auto_check_update = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
machine.wait_for_unit("murmur.service")
|
||||
machine.wait_for_unit("botamusique.service")
|
||||
|
||||
machine.sleep(10)
|
||||
|
||||
machine.wait_until_succeeds(
|
||||
"journalctl -u murmur.service -e | grep -q '<1:botamusique(-1)> Authenticated'"
|
||||
)
|
||||
|
||||
with subtest("Check systemd hardening"):
|
||||
output = machine.execute("systemctl show botamusique.service")[1]
|
||||
machine.log(output)
|
||||
output = machine.execute("systemd-analyze security botamusique.service")[1]
|
||||
machine.log(output)
|
||||
'';
|
||||
})
|
||||
|
|
@ -33,14 +33,22 @@ in {
|
|||
|
||||
autosnap = true;
|
||||
};
|
||||
datasets."pool/test".useTemplate = [ "test" ];
|
||||
datasets."pool/sanoid".useTemplate = [ "test" ];
|
||||
extraArgs = [ "--verbose" ];
|
||||
};
|
||||
|
||||
services.syncoid = {
|
||||
enable = true;
|
||||
sshKey = "/var/lib/syncoid/id_ecdsa";
|
||||
commonArgs = [ "--no-sync-snap" ];
|
||||
commands."pool/test".target = "root@target:pool/test";
|
||||
commands = {
|
||||
# Sync snapshot taken by sanoid
|
||||
"pool/sanoid" = {
|
||||
target = "root@target:pool/sanoid";
|
||||
extraArgs = [ "--no-sync-snap" ];
|
||||
};
|
||||
# Take snapshot and sync
|
||||
"pool/syncoid".target = "root@target:pool/syncoid";
|
||||
};
|
||||
};
|
||||
};
|
||||
target = { ... }: {
|
||||
|
|
@ -54,18 +62,19 @@ in {
|
|||
|
||||
testScript = ''
|
||||
source.succeed(
|
||||
"mkdir /tmp/mnt",
|
||||
"mkdir /mnt",
|
||||
"parted --script /dev/vdb -- mklabel msdos mkpart primary 1024M -1s",
|
||||
"udevadm settle",
|
||||
"zpool create pool /dev/vdb1",
|
||||
"zfs create -o mountpoint=legacy pool/test",
|
||||
"mount -t zfs pool/test /tmp/mnt",
|
||||
"zpool create pool -R /mnt /dev/vdb1",
|
||||
"zfs create pool/sanoid",
|
||||
"zfs create pool/syncoid",
|
||||
"udevadm settle",
|
||||
)
|
||||
target.succeed(
|
||||
"mkdir /mnt",
|
||||
"parted --script /dev/vdb -- mklabel msdos mkpart primary 1024M -1s",
|
||||
"udevadm settle",
|
||||
"zpool create pool /dev/vdb1",
|
||||
"zpool create pool -R /mnt /dev/vdb1",
|
||||
"udevadm settle",
|
||||
)
|
||||
|
||||
|
|
@ -76,16 +85,15 @@ in {
|
|||
"chown -R syncoid:syncoid /var/lib/syncoid/",
|
||||
)
|
||||
|
||||
source.succeed("touch /tmp/mnt/test.txt")
|
||||
# Take snapshot with sanoid
|
||||
source.succeed("touch /mnt/pool/sanoid/test.txt")
|
||||
source.systemctl("start --wait sanoid.service")
|
||||
|
||||
# Sync snapshots
|
||||
target.wait_for_open_port(22)
|
||||
source.succeed("touch /mnt/pool/syncoid/test.txt")
|
||||
source.systemctl("start --wait syncoid.service")
|
||||
target.succeed(
|
||||
"mkdir /tmp/mnt",
|
||||
"zfs set mountpoint=legacy pool/test",
|
||||
"mount -t zfs pool/test /tmp/mnt",
|
||||
)
|
||||
target.succeed("cat /tmp/mnt/test.txt")
|
||||
target.succeed("cat /mnt/pool/sanoid/test.txt")
|
||||
target.succeed("cat /mnt/pool/syncoid/test.txt")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "whipper";
|
||||
version = "0.9.1.dev7+g${lib.substring 0 7 src.rev}";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whipper-team";
|
||||
repo = "whipper";
|
||||
rev = "9e95f0604fa30ab06445fe46e3bc93bba6092a05";
|
||||
sha256 = "1c2qldw9vxpvdfh5wl6mfcd7zzz3v8r86ffqll311lcp2zin33dg";
|
||||
rev = "v${version}";
|
||||
sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
|
||||
};
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
|
|
|
|||
36
pkgs/applications/audio/ytmdesktop/default.nix
Normal file
36
pkgs/applications/audio/ytmdesktop/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, fetchurl, appimageTools, }:
|
||||
|
||||
let
|
||||
pname = "ytmdesktop";
|
||||
version = "1.13.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${version}/YouTube-Music-Desktop-App-${version}.AppImage";
|
||||
sha256 = "0f5l7hra3m3q9zd0ngc9dj4mh1lk0rgicvh9idpd27wr808vy28v";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit name src; };
|
||||
in appimageTools.wrapType2 rec {
|
||||
inherit name src;
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/{${name},${pname}}
|
||||
|
||||
install -m 444 \
|
||||
-D ${appimageContents}/youtube-music-desktop-app.desktop \
|
||||
-t $out/share/applications
|
||||
substituteInPlace \
|
||||
$out/share/applications/youtube-music-desktop-app.desktop \
|
||||
--replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Desktop App for YouTube Music";
|
||||
homepage = "https://ytmdesktop.app/";
|
||||
license = licenses.cc0;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.lgcl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
|
|||
else "https://zynaddsubfx.sourceforge.io";
|
||||
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ goibhniu metadark ];
|
||||
maintainers = with maintainers; [ goibhniu kira-bruneau ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
|
|||
description = "The Zest Framework used in ZynAddSubFX's UI";
|
||||
homepage = "https://github.com/mruby-zest";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, lua52Packages
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, openlibm
|
||||
} :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
|
||||
buildInputs = [ SDL2 lua52Packages.lua ];
|
||||
buildInputs = [ SDL2 lua52Packages.lua openlibm ];
|
||||
|
||||
postPatch = ''
|
||||
# use system Lua 5.2
|
||||
|
|
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
# extracted and adapted from build.sh
|
||||
CC=$NIX_CC/bin/cc
|
||||
CFLAGS="-Wall -O3 -g -std=gnu11 -Isrc -DLUA_USE_POPEN $(pkg-config --cflags lua sdl2)"
|
||||
LDFLAGS="$(pkg-config --libs lua sdl2)"
|
||||
LDFLAGS="$(pkg-config --libs lua sdl2 openlibm)"
|
||||
for f in $(find src -name "*.c"); do
|
||||
$CC -c $CFLAGS $f -o "''${f//\//_}.o"
|
||||
done
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
|
|||
description = "Interactive, extensible editor for binary data";
|
||||
homepage = "http://www.jemarch.net/poke";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres metadark ];
|
||||
maintainers = with maintainers; [ AndersonTorres kira-bruneau ];
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +1,16 @@
|
|||
diff --git i/goldendict.pro w/goldendict.pro
|
||||
index 328dc20..5202a07 100644
|
||||
index 4a4a3094..082b728f 100644
|
||||
--- i/goldendict.pro
|
||||
+++ w/goldendict.pro
|
||||
@@ -210,21 +210,18 @@ mac {
|
||||
@@ -212,22 +212,19 @@ mac {
|
||||
-llzo2
|
||||
!CONFIG( no_ffmpeg_player ) {
|
||||
LIBS += -lao \
|
||||
- -lswresample-gd \
|
||||
- -lavutil-gd \
|
||||
- -lavformat-gd \
|
||||
- -lavcodec-gd
|
||||
+ -lswresample \
|
||||
+ -lavutil \
|
||||
+ -lavformat \
|
||||
+ -lavcodec
|
||||
|
|
@ -29,7 +31,7 @@ index 328dc20..5202a07 100644
|
|||
cp -R locale/*.qm GoldenDict.app/Contents/MacOS/locale/ & \
|
||||
mkdir -p GoldenDict.app/Contents/MacOS/help & \
|
||||
cp -R $${PWD}/help/*.qch GoldenDict.app/Contents/MacOS/help/
|
||||
@@ -232,15 +229,6 @@ mac {
|
||||
@@ -235,15 +232,6 @@ mac {
|
||||
CONFIG += zim_support
|
||||
!CONFIG( no_chinese_conversion_support ) {
|
||||
CONFIG += chinese_conversion_support
|
||||
|
|
@ -46,17 +48,15 @@ index 328dc20..5202a07 100644
|
|||
}
|
||||
DEFINES += PROGRAM_VERSION=\\\"$$VERSION\\\"
|
||||
diff --git i/tiff.cc w/tiff.cc
|
||||
index e3cb8bf..9ff880f 100644
|
||||
index e3cb8bf5..95dd812f 100644
|
||||
--- i/tiff.cc
|
||||
+++ w/tiff.cc
|
||||
@@ -6,8 +6,8 @@
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "tiff.hh"
|
||||
|
||||
#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
|
||||
-#include "tiff/tiff.h"
|
||||
-#include "tiff/tiffio.h"
|
||||
+#include "tiff.h"
|
||||
+#include "tiffio.h"
|
||||
-#if defined (Q_OS_MAC) || defined (Q_OS_WIN)
|
||||
+#if defined (Q_OS_WIN)
|
||||
#include "tiff/tiff.h"
|
||||
#include "tiff/tiffio.h"
|
||||
#else
|
||||
#include "tiff.h"
|
||||
#include "tiffio.h"
|
||||
|
|
|
|||
|
|
@ -4,19 +4,19 @@
|
|||
, withCC ? true, opencc
|
||||
, withEpwing ? true, libeb
|
||||
, withExtraTiff ? true, libtiff
|
||||
, withFFmpeg ? true, libao, ffmpeg_3
|
||||
, withFFmpeg ? true, libao, ffmpeg
|
||||
, withMultimedia ? true
|
||||
, withZim ? true, zstd }:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "goldendict";
|
||||
version = "2020-12-09";
|
||||
version = "2021-03-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goldendict";
|
||||
repo = pname;
|
||||
rev = "261e45a5d79f9df2fbc050292410bed0f4ef3132";
|
||||
sha256 = "01pny06d4cmwf998hpqd7xx7mccbbasb8js1bv3rkdi1ljg01f7n";
|
||||
rev = "b2e673961d28ca5eb920a909091252d3321f09d6";
|
||||
sha256 = "sha256-+AAamnICq0/B54ggFpgF/Uupm1a4YiEYgHXrhIK4M0E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -39,7 +39,7 @@ mkDerivation rec {
|
|||
++ lib.optional withCC opencc
|
||||
++ lib.optional withEpwing libeb
|
||||
++ lib.optional withExtraTiff libtiff
|
||||
++ lib.optionals withFFmpeg [ libao ffmpeg_3 ]
|
||||
++ lib.optionals withFFmpeg [ libao ffmpeg ]
|
||||
++ lib.optional withZim zstd;
|
||||
|
||||
qmakeFlags = with lib; [
|
||||
|
|
|
|||
35
pkgs/applications/misc/opentrack/aruco.nix
Normal file
35
pkgs/applications/misc/opentrack/aruco.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib, stdenv, cmake, fetchFromGitHub, opencv4 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "opentrack-aruco";
|
||||
version = "unstable-20190303";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentrack";
|
||||
repo = "aruco";
|
||||
rev = "12dc60efd61149227bd05c805208d9bcce308f6d";
|
||||
sha256 = "0gkrixgfbpg8pls4qqilphbz4935mg5z4p18a0vv6kclmfccw9ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ opencv4 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/include/aruco
|
||||
'';
|
||||
|
||||
# copy headers required by main package
|
||||
postInstall = ''
|
||||
cp $src/src/*.h $out/include/aruco
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/opentrack/aruco";
|
||||
description = "C++ library for detection of AR markers based on OpenCV";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ zaninime ];
|
||||
};
|
||||
}
|
||||
58
pkgs/applications/misc/opentrack/default.nix
Normal file
58
pkgs/applications/misc/opentrack/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ mkDerivation, lib, callPackage, fetchzip, fetchFromGitHub, cmake, pkg-config
|
||||
, ninja, copyDesktopItems, qtbase, qttools, opencv4, procps, eigen, libXdmcp
|
||||
, libevdev, makeDesktopItem, fetchurl }:
|
||||
|
||||
let
|
||||
version = "2.3.13";
|
||||
|
||||
aruco = callPackage ./aruco.nix { };
|
||||
|
||||
# license.txt inside the zip file is MIT
|
||||
xplaneSdk = fetchzip {
|
||||
url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sample_templates/XPSDK303.zip";
|
||||
sha256 = "11wqjsr996c5qhiv2djsd55gc373a9qcq30dvc6rhzm0fys42zba";
|
||||
};
|
||||
|
||||
in mkDerivation {
|
||||
pname = "opentrack";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opentrack";
|
||||
repo = "opentrack";
|
||||
rev = "opentrack-${version}";
|
||||
sha256 = "1s986lmm5l1pwbwvd1pfiq84n32s1q1dav7a0cbga4d1vcf0v1ay";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ninja copyDesktopItems ];
|
||||
buildInputs = [ qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=RELEASE"
|
||||
"-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
|
||||
"-DSDK_XPLANE=${xplaneSdk}"
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = "opentrack";
|
||||
exec = "opentrack";
|
||||
icon = fetchurl {
|
||||
url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";
|
||||
sha256 = "0d114zk78f7nnrk89mz4gqn7yk3k71riikdn29w6sx99h57f6kgn";
|
||||
};
|
||||
desktopName = name;
|
||||
genericName = "Head tracking software";
|
||||
categories = "Utility;";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/opentrack/opentrack";
|
||||
description = "Head tracking software for MS Windows, Linux, and Apple OSX";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ zaninime ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,41 +5,21 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "synergy";
|
||||
version = "1.11.1";
|
||||
version = "1.13.1.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "symless";
|
||||
repo = "synergy-core";
|
||||
rev = "${version}-stable";
|
||||
sha256 = "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1phg0szc9g018zxs5wbys4drzq1cdhyzajfg45l6a3fmi6qdi1kw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./build-tests.patch
|
||||
(fetchpatch {
|
||||
name = "CVE-2020-15117.patch";
|
||||
url = "https://github.com/symless/synergy-core/commit/"
|
||||
+ "0a97c2be0da2d0df25cb86dfd642429e7a8bea39.patch";
|
||||
sha256 = "03q8m5n50fms7fjfjgmqrgy9mrxwi9kkz3f3vlrs2x5h21dl6bmj";
|
||||
})
|
||||
] ++ lib.optional stdenv.isDarwin ./macos_build_fix.patch;
|
||||
|
||||
# Since the included gtest and gmock don't support clang and the
|
||||
# segfault when built with gcc9, we replace it with 1.10.0 for
|
||||
# synergy-1.11.0. This should become unnecessary when upstream
|
||||
# updates these dependencies.
|
||||
googletest = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
rev = "release-1.10.0";
|
||||
sha256 = "1zbmab9295scgg4z2vclgfgjchfjailjnvzc6f5x9jvlsdi3dpwz";
|
||||
};
|
||||
patches = lib.optional stdenv.isDarwin ./macos_build_fix.patch;
|
||||
|
||||
postPatch = ''
|
||||
rm -r ext/*
|
||||
cp -r ${googletest}/googlemock ext/gmock/
|
||||
cp -r ${googletest}/googletest ext/gtest/
|
||||
chmod -R +w ext/
|
||||
substituteInPlace src/gui/src/SslCertificate.cpp \
|
||||
--replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF";
|
||||
|
|
@ -63,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/
|
||||
'' + lib.optionalString withGUI ''
|
||||
cp bin/synergy $out/bin/
|
||||
wrapQtApp $out/bin/synergy --prefix PATH : ${lib.makeBinPath [ openssl ]}
|
||||
wrapQtApp $out/bin/synergy
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $out/share/icons/hicolor/scalable/apps
|
||||
cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/
|
||||
|
|
@ -80,9 +60,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Share one mouse and keyboard between multiple computers";
|
||||
homepage = "http://synergy-project.org/";
|
||||
homepage = "https://synergy-project.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ talyz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,8 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a2297311..25a51f56 100644
|
||||
index c1e78d1d..13639ba1 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -138,7 +138,7 @@ if (UNIX)
|
||||
|
||||
|
||||
if (APPLE)
|
||||
- set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
|
||||
+ set (CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
find_library (lib_ScreenSaver ScreenSaver)
|
||||
find_library (lib_IOKit IOKit)
|
||||
@@ -292,14 +292,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
@@ -328,14 +328,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||
${OPENSSL_ROOT}/lib/libssl.lib
|
||||
${OPENSSL_ROOT}/lib/libcrypto.lib
|
||||
)
|
||||
|
|
@ -22,8 +13,8 @@ index a2297311..25a51f56 100644
|
|||
- ${OPENSSL_ROOT}/lib/libssl.a
|
||||
- ${OPENSSL_ROOT}/lib/libcrypto.a
|
||||
- )
|
||||
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|.*BSD|DragonFly")
|
||||
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin|.*BSD|DragonFly")
|
||||
set (OPENSSL_LIBS ssl crypto)
|
||||
else()
|
||||
message (FATAL_ERROR "Couldn't find OpenSSL")
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";
|
||||
homepage = "https://nyxt.atlas.engineer";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ lewo ];
|
||||
maintainers = with maintainers; [ lewo payas ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,26 +2,29 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "starboard-octant-plugin";
|
||||
version = "0.10.0";
|
||||
version = "0.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3BifigdAFuOCrhJRv/w4k7pT4BTHfINuEkeG6zaI0v8=";
|
||||
sha256 = "sha256-9vl068ZTw6Czf+cWQ0k1lU0pqh7P0YZgLguHkk3M918=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-1NTneOGU4R1xzR9hAI9MJWYuYTPgYtLa5vH1H5wyHcM=";
|
||||
vendorSha256 = "sha256-HOvZPDVKZEoL91yyaJRuKThHirY77xlKOtLKARthxn8=";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=" "-s" "-w" ];
|
||||
preBuild = ''
|
||||
buildFlagsArray+=("-ldflags" "-s -w")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/aquasecurity/starboard-octant-plugin";
|
||||
changelog = "https://github.com/aquasecurity/starboard-octant-plugin/releases/tag/v${version}";
|
||||
description = "Octant plugin for viewing Starboard security information";
|
||||
longDescription = ''
|
||||
This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for
|
||||
Kubernetes workloads stored as custom security resources.
|
||||
'';
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -89,6 +89,6 @@ stdenv.mkDerivation rec {
|
|||
description = "A modern feed reader designed for the GNOME desktop";
|
||||
homepage = "https://gitlab.com/news-flash/news_flash_gtk";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.121";
|
||||
version = "3.1.127";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "91270a51ed29e4a578c7549ebd01665f4bcf49bf7773a15db27f4ccb13659e00";
|
||||
sha256 = "25a973eb54f2f9ccd422d536b29038c570de3584b8174d993119e3c6b434cc54";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "suricata";
|
||||
version = "5.0.3";
|
||||
version = "6.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1nv5aq5lpkpskkzw05hr2lshkzcs4zqj5kfv4qjlbwigmp6kwh9l";
|
||||
sha256 = "sha256-XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ in {
|
|||
pname = "discord-canary";
|
||||
binaryName = "DiscordCanary";
|
||||
desktopName = "Discord Canary";
|
||||
version = "0.0.121";
|
||||
version = "0.0.122";
|
||||
src = fetchurl {
|
||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||
sha256 = "0s85nh31wv39adawfmllp128n0wgyisbi604n0cngzi28rdw7bph";
|
||||
sha256 = "0ph7gp77wzjpr7nhv13fg64j97dxjwmivshr56ly3kjhmvvanj7k";
|
||||
};
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, python3, which, ldc, zlib }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, which, ldc, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sambamba";
|
||||
|
|
@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes hardcoded gcc, making clang build possible.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/biod/sambamba/commit/c50a1c91e1ba062635467f197139bf6784e9be15.patch";
|
||||
sha256 = "1y0vlybmb9wpg4z1nca7m96mk9hxmvd3yrg7w8rxscj45hcqvf8q";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ which python3 ldc ];
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
|||
pyyaml
|
||||
ratelimiter
|
||||
requests
|
||||
smart_open
|
||||
smart-open
|
||||
toposort
|
||||
wrapt
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, writeText, libX11, ncurses
|
||||
, libXft, conf ? null, patches ? [], extraLibs ? []}:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, writeText
|
||||
, libX11
|
||||
, ncurses
|
||||
, fontconfig
|
||||
, freetype
|
||||
, libXft
|
||||
, conf ? null
|
||||
, patches ? [ ]
|
||||
, extraLibs ? [ ]
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -14,18 +26,34 @@ stdenv.mkDerivation rec {
|
|||
|
||||
inherit patches;
|
||||
|
||||
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
|
||||
configFile = optionalString (conf != null) (writeText "config.def.h" conf);
|
||||
|
||||
postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"
|
||||
+ optionalString stdenv.isDarwin ''
|
||||
postPatch = optionalString (conf != null) "cp ${configFile} config.def.h"
|
||||
+ optionalString stdenv.isDarwin ''
|
||||
substituteInPlace config.mk --replace "-lrt" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ncurses ];
|
||||
buildInputs = [ libX11 libXft ] ++ extraLibs;
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [
|
||||
"PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
ncurses
|
||||
fontconfig
|
||||
freetype
|
||||
];
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXft
|
||||
] ++ extraLibs;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
TERMINFO=$out/share/terminfo make install PREFIX=$out
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ buildPythonApplication rec {
|
|||
description = "Tool to submit code to Gerrit";
|
||||
homepage = "https://opendev.org/opendev/git-review";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, gtksourceview4, docutils
|
||||
, spiceSupport ? true, spice-gtk ? null
|
||||
, cpio, e2fsprogs, findutils, gzip
|
||||
, cdrtools
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
|
@ -53,8 +54,21 @@ python3Packages.buildPythonApplication rec {
|
|||
gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
|
||||
'';
|
||||
|
||||
# Failed tests
|
||||
doCheck = false;
|
||||
checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_cli.py"
|
||||
"tests/test_disk.py"
|
||||
"tests/test_checkprops.py"
|
||||
]; # Error logs: https://gist.github.com/superherointj/fee040872beaafaaa19b8bf8f3ff0be5
|
||||
|
||||
preCheck = ''
|
||||
export HOME=.
|
||||
''; # <- Required for "tests/test_urldetect.py".
|
||||
|
||||
postCheck = ''
|
||||
$out/bin/virt-manager --version | grep -Fw ${version} > /dev/null
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://virt-manager.org";
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{ fetchurl, lib, i3, autoreconfHook }:
|
||||
{ fetchFromGitHub, lib, i3 }:
|
||||
|
||||
i3.overrideAttrs (oldAttrs : rec {
|
||||
|
||||
name = "i3-gaps-${version}";
|
||||
pname = "i3-gaps";
|
||||
version = "4.19.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Airblader/i3/releases/download/${version}/i3-${version}.tar.xz";
|
||||
sha256 = "sha256-+yZ4Pc7zPZfwgBKbjQsrlXxIaxJBmIdE47lljx8FZG0=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Airblader";
|
||||
repo = "i3";
|
||||
rev = version;
|
||||
sha256 = "sha256-Ydks0hioGAnVBGKraoy3a7Abq9/vHmSne+VFbrYXCug=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
pkgargs@{ lib, haskellPackages, writeText, gawk }:
|
||||
pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }:
|
||||
let
|
||||
generic-fetcher =
|
||||
import ./generic-fetcher.nix pkgargs;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
pkgargs@{ lib, haskellPackages, writeText, gawk }:
|
||||
pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }:
|
||||
let
|
||||
generic-fetcher =
|
||||
import ./generic-fetcher.nix pkgargs;
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "0.52";
|
||||
version = "0.53.1";
|
||||
in fetchzip {
|
||||
name = "sudo-font-${version}";
|
||||
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
|
||||
sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja";
|
||||
url = "https://github.com/jenskutilek/sudo-font/raw/v${version}/dist/sudo.zip";
|
||||
sha256 = "1jil43j9ngz4422m76x67bafvxz75rncqqi57xd7fdxgcff7i8dp";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/
|
||||
unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff/
|
||||
unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2/
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Font for programmers and command line users";
|
||||
homepage = "https://www.kutilek.de/sudo-font/";
|
||||
changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";
|
||||
license = licenses.ofl;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "matcha-gtk-theme";
|
||||
version = "2021-04-09";
|
||||
version = "2021-05-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vinceliuice";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1989v2924g1pwycp44zlgryr73p82n9hmf71d0acs455jajf0pvv";
|
||||
sha256 = "0jx55dn9j0395ws7507mj8px4yq4jlmms6xr9jlhp0qxnr4y1smd";
|
||||
};
|
||||
|
||||
buildInputs = [ gdk-pixbuf librsvg ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zuki-themes";
|
||||
version = "3.36-4";
|
||||
version = "3.38-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lassekongo83";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "14r8dhfycpmwp2nj6vj0b2cwaaphc9sxbzglc4sr4q566whrhbgd";
|
||||
sha256 = "0890i8kavgnrhm8ic4zpl16wc4ngpnf1zi8js9gvki2cl7dlj1xm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja sassc ];
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
, cinnamon-desktop
|
||||
, cinnamon-menus
|
||||
, cinnamon-session
|
||||
, cinnamon-translations
|
||||
, cjs
|
||||
, fetchFromGitHub
|
||||
, gdk-pixbuf
|
||||
|
|
@ -115,7 +116,10 @@ stdenv.mkDerivation rec {
|
|||
gtk-doc
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-static" "--with-ca-certificates=${cacert}/etc/ssl/certs/ca-bundle.crt" "--with-libxml=${libxml2.dev}/include/libxml2" "--enable-gtk-doc=no" ];
|
||||
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
||||
postInstall = ''
|
||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
find . -type f -exec sed -i \
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
, gdk-pixbuf
|
||||
, meson
|
||||
, ninja
|
||||
, cinnamon-translations
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -83,7 +84,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
mesonFlags = [
|
||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||
# use locales from cinnamon-translations
|
||||
"--localedir=${cinnamon-translations}/share/locale"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ fetchFromGitHub
|
||||
, cinnamon-desktop
|
||||
, cinnamon-settings-daemon
|
||||
, cinnamon-translations
|
||||
, dbus-glib
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_412
|
||||
|
|
@ -80,8 +81,14 @@ stdenv.mkDerivation rec {
|
|||
xmlto
|
||||
];
|
||||
|
||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ];
|
||||
mesonFlags = [
|
||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||
"-Dgconf=false"
|
||||
"-DENABLE_IPV6=true"
|
||||
# use locales from cinnamon-translations
|
||||
"--localedir=${cinnamon-translations}/share/locale"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x data/meson_install_schemas.py # patchShebangs requires executable file
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ fetchFromGitHub
|
||||
, cinnamon-desktop
|
||||
, cinnamon-translations
|
||||
, colord
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
|
|
@ -104,6 +105,11 @@ stdenv.mkDerivation rec {
|
|||
sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h
|
||||
'';
|
||||
|
||||
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
||||
postInstall = ''
|
||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||
'';
|
||||
|
||||
# So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper
|
||||
postFixup = ''
|
||||
mkdir -p $out/bin/cinnamon-settings-daemon
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
, exempi
|
||||
, intltool
|
||||
, shared-mime-info
|
||||
, cinnamon-translations
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -57,6 +58,8 @@ stdenv.mkDerivation rec {
|
|||
mesonFlags = [
|
||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
||||
# use locales from cinnamon-translations
|
||||
"--localedir=${cinnamon-translations}/share/locale"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,26 +1,59 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf
|
||||
, librsvg, gsound, libmanette
|
||||
, gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
|
||||
, meson, ninja, python3, vala, desktop-file-utils
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
gnome,
|
||||
gdk-pixbuf,
|
||||
librsvg,
|
||||
gsound,
|
||||
libmanette,
|
||||
gettext,
|
||||
itstool,
|
||||
libxml2,
|
||||
clutter,
|
||||
clutter-gtk,
|
||||
wrapGAppsHook,
|
||||
meson,
|
||||
ninja,
|
||||
python3,
|
||||
vala,
|
||||
desktop-file-utils,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quadrapassel";
|
||||
version = "3.38.1";
|
||||
version = "40.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "033plabc6q3sk6qjr5nml8z6p07vcw57gxddxjk9b65wgg0rzzhr";
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1d59sxmmmhi611hvr5jmsm276j9w20hc5yq4rk0s4d3svadyap79";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja python3 vala desktop-file-utils
|
||||
pkg-config gnome.adwaita-icon-theme
|
||||
libxml2 itstool gettext wrapGAppsHook
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
vala
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
gnome.adwaita-icon-theme
|
||||
libxml2
|
||||
itstool
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 gdk-pixbuf librsvg libmanette
|
||||
gsound clutter libxml2 clutter-gtk
|
||||
gtk3
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
libmanette
|
||||
gsound
|
||||
clutter
|
||||
libxml2
|
||||
clutter-gtk
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
|
@ -33,7 +66,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Classic falling-block game, Tetris";
|
||||
homepage = "https://wiki.gnome.org/Apps/Quadrapassel";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,38 +1,69 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf
|
||||
, librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook
|
||||
, meson, ninja, python3, desktop-file-utils
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
gtk3,
|
||||
gnome,
|
||||
gdk-pixbuf,
|
||||
librsvg,
|
||||
libgnome-games-support,
|
||||
gettext,
|
||||
itstool,
|
||||
libxml2,
|
||||
wrapGAppsHook,
|
||||
meson,
|
||||
ninja,
|
||||
python3,
|
||||
desktop-file-utils,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tali";
|
||||
version = "40.0";
|
||||
version = "40.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; };
|
||||
sha256 = "1xhp30c70bi8p4sm6v8zmxi1p55fs56dqgfbhfnsda5g1cxwir7h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson ninja python3 desktop-file-utils
|
||||
pkg-config gnome.adwaita-icon-theme
|
||||
libxml2 itstool gettext wrapGAppsHook
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
desktop-file-utils
|
||||
pkg-config
|
||||
gnome.adwaita-icon-theme
|
||||
libxml2
|
||||
itstool
|
||||
gettext
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gdk-pixbuf
|
||||
librsvg
|
||||
libgnome-games-support
|
||||
];
|
||||
buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/meson_post_install.py
|
||||
patchShebangs build-aux/meson_post_install.py
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
attrPath = "gnome.${pname}";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://wiki.gnome.org/Apps/Tali";
|
||||
description = "Sort of poker with dice and less money";
|
||||
maintainers = teams.gnome.members;
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,13 +73,14 @@ with pkgs;
|
|||
optionalExtensions = cond: as: if cond then as else [];
|
||||
python2Extension = import ../../../top-level/python2-packages.nix;
|
||||
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
|
||||
aliases = self: super: lib.optionalAttrs (config.allowAliases or true) (import ../../../top-level/python-aliases.nix lib self super);
|
||||
in lib.makeScopeWithSplicing
|
||||
pkgs.splicePackages
|
||||
pkgs.newScope
|
||||
otherSplices
|
||||
keep
|
||||
extra
|
||||
(lib.extends extensions pythonPackagesFun))
|
||||
(lib.extends (lib.composeExtensions aliases extensions) pythonPackagesFun))
|
||||
{
|
||||
overrides = packageOverrides;
|
||||
};
|
||||
|
|
|
|||
15
pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch
Normal file
15
pkgs/development/libraries/abseil-cpp/cmake-full-dirs.patch
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
|
||||
index 1a80b5b..1fa57a7 100644
|
||||
--- a/CMake/AbseilHelpers.cmake
|
||||
+++ b/CMake/AbseilHelpers.cmake
|
||||
@@ -171,8 +171,8 @@ function(absl_cc_library)
|
||||
FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" CONTENT "\
|
||||
prefix=${CMAKE_INSTALL_PREFIX}\n\
|
||||
exec_prefix=\${prefix}\n\
|
||||
-libdir=\${prefix}/${CMAKE_INSTALL_LIBDIR}\n\
|
||||
-includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}\n\
|
||||
+libdir=${CMAKE_INSTALL_FULL_LIBDIR}\n\
|
||||
+includedir=${CMAKE_INSTALL_FULL_INCLUDEDIR}\n\
|
||||
\n\
|
||||
Name: absl_${_NAME}\n\
|
||||
Description: Abseil ${_NAME} library\n\
|
||||
|
|
@ -1,16 +1,25 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, static ? stdenv.hostPlatform.isStatic }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, static ? stdenv.hostPlatform.isStatic }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "abseil-cpp";
|
||||
version = "20200923.3";
|
||||
version = "20210324.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abseil";
|
||||
repo = "abseil-cpp";
|
||||
rev = version;
|
||||
sha256 = "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl";
|
||||
sha256 = "16w63brfwgiayiyhvawsnr14xyy5hpp68k8fj0z6yk0bjzw6jvjw";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use CMAKE_INSTALL_FULL_{LIBDIR,INCLUDEDIR}
|
||||
# https://github.com/abseil/abseil-cpp/pull/963
|
||||
(fetchpatch {
|
||||
url = "https://github.com/abseil/abseil-cpp/commit/5bfa70c75e621c5d5ec095c8c4c0c050dcb2957e.patch";
|
||||
sha256 = "0nhjxqfxpi2pkfinnqvd5m4npf9l1kg39mjx9l3087ajhadaywl5";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_STANDARD=17"
|
||||
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cairomm";
|
||||
version = "1.16.0";
|
||||
version = "1.16.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y";
|
||||
sha256 = "sha256-b2Bg2OmN1Lis/uIpX92904z0h8B8JqrY0ag7ub/0osY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cereal";
|
||||
version = "1.3.0";
|
||||
|
|
@ -12,7 +12,19 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0hc8wh9dwpc1w1zf5lfss4vg5hmgpblqxbrpp1rggicpx9ar831p";
|
||||
};
|
||||
|
||||
cmakeFlagsArray = [ "-DJUST_INSTALL_CEREAL=yes" ];
|
||||
patches = [
|
||||
# https://nvd.nist.gov/vuln/detail/CVE-2020-11105
|
||||
# serialized std::shared_ptr variables cannot always be expected to
|
||||
# serialize back into their original values. This can have any number of
|
||||
# consequences, depending on the context within which this manifests.
|
||||
(fetchpatch {
|
||||
name = "CVE-2020-11105.patch";
|
||||
url = "https://github.com/USCiLab/cereal/commit/f27c12d491955c94583512603bf32c4568f20929.patch";
|
||||
sha256 = "CIkbJ7bAN0MXBhTXQdoQKXUmY60/wQvsdn99FaWt31w=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DJUST_INSTALL_CEREAL=yes" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A header-only C++11 serialization library";
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glibmm";
|
||||
version = "2.68.0";
|
||||
version = "2.68.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U=";
|
||||
sha256 = "sha256-ZmTifJqcyoHCnjVof0ny4NFzovyemMNCgxH3B9tTL4w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblinphone";
|
||||
version = "4.5.15";
|
||||
version = "4.5.17";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-lDj2OkWuodPHpvoJ5W2GivzVIeMnprb42kAnJKfKtdg=";
|
||||
sha256 = "sha256-ryyT4bG3lnE72ydvCAoiT3IeHY4mZwX9nCqaTRC1wyc=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, abseil-cpp
|
||||
, bzip2
|
||||
|
|
@ -17,25 +16,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "or-tools";
|
||||
version = "8.1";
|
||||
version = "9.0";
|
||||
disabled = python.pythonOlder "3.6"; # not supported upstream
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "or-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg";
|
||||
sha256 = "0yihrsg8wj4b82xwg1hbn97my8zqd7xhw7dk7wm2axsyvqd6m3b3";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect
|
||||
# USE_SCIP=OFF and then failing to find scip/scip.h
|
||||
(fetchpatch {
|
||||
url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch";
|
||||
sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0";
|
||||
})
|
||||
];
|
||||
|
||||
# The original build system uses cmake which does things like pull
|
||||
# in dependencies through git and Makefile creation time. We
|
||||
# obviously don't want to do this so instead we provide the
|
||||
|
|
|
|||
|
|
@ -124,8 +124,7 @@ let lispPackages = rec {
|
|||
};
|
||||
nyxt = pkgs.lispPackages.buildLispPackage rec {
|
||||
baseName = "nyxt";
|
||||
version = "2021-05-06";
|
||||
|
||||
version = "2.0.0";
|
||||
|
||||
description = "Browser";
|
||||
|
||||
|
|
@ -194,10 +193,8 @@ let lispPackages = rec {
|
|||
src = pkgs.fetchFromGitHub {
|
||||
owner = "atlas-engineer";
|
||||
repo = "nyxt";
|
||||
rev = "940a5f9a19770771cf29f8fa7505e99c3a242b67";
|
||||
sha256 = "sha256:0d5mawka26gwi9nb45x1n33vgskwyn46jrvfz7nzmm2jfaq4ipn6";
|
||||
# Version 2 pre-release 7
|
||||
# date = "2021-05-06T11:30:27Z";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-eSRNfzkAzGTorLjdHo1LQEKLx4ASdv3RGXIFZ5WFIXk=";
|
||||
};
|
||||
|
||||
packageName = "nyxt";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiohomekit";
|
||||
version = "0.2.61";
|
||||
version = "0.2.62";
|
||||
format = "pyproject";
|
||||
disabled = pythonAtLeast "3.9";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "Jc2k";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "047ql5a4i4354jgr8xr2waim8j522z58vbfi7aa62jqc9l8jzxzk";
|
||||
sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
pname = "azure-core";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "624b46db407dbed9e03134ab65214efab5b5315949a1fbd6cd592c46fb272588";
|
||||
sha256 = "f32bb64aabe61f496255c16dd6c555a027da628109460bf27311cee0caf78f96";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -45,8 +45,13 @@ buildPythonPackage rec {
|
|||
pytestFlagsArray = [ "tests/" ];
|
||||
# disable tests which touch network
|
||||
disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ];
|
||||
# requires testing modules which aren't published, and likely to create cyclic dependencies
|
||||
disabledTestPaths = [ "tests/test_connection_string_parsing.py" ];
|
||||
disabledTestPaths = [
|
||||
# requires testing modules which aren't published, and likely to create cyclic dependencies
|
||||
"tests/test_connection_string_parsing.py"
|
||||
# wants network
|
||||
"tests/async_tests/test_streaming_async.py"
|
||||
"tests/test_streaming.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Core Library for Python";
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-eventgrid";
|
||||
version = "4.1.1";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "c3bd28ccf6c837b58b58fc61275dace5348a823660c3ca21166a88aa2a8377a4";
|
||||
sha256 = "77af2c20abde7d8342da7993781605b440aeac0f95c4af13bb87465c3bd5fe35";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-identity";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396";
|
||||
sha256 = "2e70b00874e4f288e37804bc06bfaf216de8565c759594bf79cccfbf9ca2c78a";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchPypi
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, python
|
||||
, isPy3k
|
||||
|
|
@ -10,17 +11,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-billing";
|
||||
version = "1.0.0"; #pypi's 0.2.0 doesn't build ootb
|
||||
version = "6.0.0"; #pypi's 0.2.0 doesn't build ootb
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
|
||||
sha256 = "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,27 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, msrest
|
||||
, msrestazure
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.3.0";
|
||||
version = "1.0.0";
|
||||
pname = "azure-mgmt-botservice";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
|
||||
sha256 = "9dae4d749a2a072e22703318ea36e379aec20876c553b2889037c7bdec4b9546";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ azure-common msrest msrestazure ];
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
msrest
|
||||
msrestazure
|
||||
];
|
||||
|
||||
# no tests included
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-cosmosdb";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74";
|
||||
sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,21 +1,27 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, msrest
|
||||
, msrestazure
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.2.0";
|
||||
version = "1.0.0";
|
||||
pname = "azure-mgmt-deploymentmanager";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
|
||||
sha256 = "9badb768617209149c33e68ca2e59c35b1d3d11427e2969872f2e236e14eee78";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ azure-common msrest msrestazure ];
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
msrest
|
||||
msrestazure
|
||||
];
|
||||
|
||||
# no tests included
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-iothub";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "7acf24088395a299974dd26406db2686d8d59a3fffbe47c24617b36d445f2de8";
|
||||
sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-loganalytics";
|
||||
version = "9.0.0";
|
||||
version = "10.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "c0b702753c0774a25bcb49b967573b0ec2bef5262c24bc371c219a750ba3c4fd";
|
||||
sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-maps";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "dafbe23bdbe9c01f88ce91c5b8587eefc73ac2d637ebcdc59ded6d332932e3ab";
|
||||
sha256 = "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "18.0.0";
|
||||
version = "19.0.0";
|
||||
pname = "azure-mgmt-network";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a";
|
||||
sha256 = "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,24 +5,26 @@
|
|||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.1.0";
|
||||
version = "1.0.0";
|
||||
pname = "azure-mgmt-redhatopenshift";
|
||||
disabled = isPy27; # don't feel like fixing namespace issues on python2
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn";
|
||||
sha256 = "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
];
|
||||
|
||||
pythonNamespaces = "azure.mgmt";
|
||||
|
|
|
|||
|
|
@ -4,24 +4,26 @@
|
|||
, msrest
|
||||
, msrestazure
|
||||
, azure-common
|
||||
, azure-mgmt-core
|
||||
, azure-mgmt-nspkg
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-reservations";
|
||||
version = "0.9.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1dc97f48f3edb67116da8604ab76ef93233319f56455532be307f323e9ebf0e6";
|
||||
sha256 = "880df54fdf3869ee6b142d4fc7a3fce518c850523c42cc895b7fb8359956554e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
msrest
|
||||
msrestazure
|
||||
azure-common
|
||||
azure-mgmt-core
|
||||
] ++ lib.optionals (!isPy3k) [
|
||||
azure-mgmt-nspkg
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "16.1.0";
|
||||
version = "18.0.0";
|
||||
pname = "azure-mgmt-resource";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "b814ee27b37f030fe69461ef6f514661340dc8b1f28736362541e1c0d31d90ae";
|
||||
sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-sql";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47";
|
||||
sha256 = "191accd6e5b47f93a10cebb94e2ca5086f0b6f4afd0290b8596206cd4acb0d5c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "17.1.0";
|
||||
version = "18.0.0";
|
||||
pname = "azure-mgmt-storage";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600";
|
||||
sha256 = "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-servicebus";
|
||||
version = "7.1.1";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "58797defe666dd17ae11a8895395e7e844f11d2076ba4a9ce63682ac02f665d9";
|
||||
sha256 = "919e81d6d9e6e098dbb7abf51d90282a73c0071846b104e70488417cd5d07863";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-synapse-artifacts";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210";
|
||||
sha256 = "2a538d617dc5d2d167716226d0a24e416324efb35ef22b223e0d9fb6b9889a72";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ buildPythonPackage rec {
|
|||
description = "An implementation of the Debug Adapter Protocol for Python";
|
||||
homepage = "https://github.com/microsoft/debugpy";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@ buildPythonPackage rec {
|
|||
propagatedBuildInputs = [ atpublic psutil ];
|
||||
checkInputs = [ pytestCheckHook pytestcov sybil ];
|
||||
|
||||
# disable code coverage checks for all OS. Upstream does not enforce these
|
||||
# checks on Darwin, and code coverage cannot be improved downstream nor is it
|
||||
# relevant to the user.
|
||||
pytestFlagsArray = [ "--no-cov" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://flufllock.readthedocs.io/";
|
||||
description = "NFS-safe file locking with timeouts for POSIX and Windows";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, numpy
|
||||
, six
|
||||
, scipy
|
||||
, smart_open
|
||||
, smart-open
|
||||
, scikit-learn, testfixtures, unittest2
|
||||
, isPy3k
|
||||
}:
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ smart_open numpy six scipy ];
|
||||
propagatedBuildInputs = [ smart-open numpy six scipy ];
|
||||
|
||||
checkInputs = [ scikit-learn testfixtures unittest2 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
|
|
@ -71,6 +72,9 @@ buildPythonPackage rec {
|
|||
"test_list_formats"
|
||||
"test_base_url"
|
||||
"test_culling"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# attempts to use trashcan, build env doesn't allow this
|
||||
"test_delete"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, pytestCheckHook
|
||||
, typer
|
||||
, dataclasses
|
||||
, smart_open
|
||||
, smart-open
|
||||
, pytest
|
||||
, mock
|
||||
, google-cloud-storage
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ smart_open typer google-cloud-storage ];
|
||||
propagatedBuildInputs = [ smart-open typer google-cloud-storage ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ buildPythonPackage rec {
|
|||
description = "Pythonic generic implementation of the Language Server Protocol";
|
||||
homepage = "https://github.com/openlawlibrary/pygls";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ metadark ];
|
||||
maintainers = with maintainers; [ kira-bruneau ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue