Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
6a307a25ce
|
|
@ -394,3 +394,142 @@ buildImage {
|
|||
};
|
||||
}
|
||||
```
|
||||
|
||||
## buildNixShellImage {#ssec-pkgs-dockerTools-buildNixShellImage}
|
||||
|
||||
Create a Docker image that sets up an environment similar to that of running `nix-shell` on a derivation.
|
||||
When run in Docker, this environment somewhat resembles the Nix sandbox typically used by `nix-build`, with a major difference being that access to the internet is allowed.
|
||||
It additionally also behaves like an interactive `nix-shell`, running things like `shellHook` and setting an interactive prompt.
|
||||
If the derivation is fully buildable (i.e. `nix-build` can be used on it), running `buildDerivation` inside such a Docker image will build the derivation, with all its outputs being available in the correct `/nix/store` paths, pointed to by the respective environment variables like `$out`, etc.
|
||||
|
||||
::: {.warning}
|
||||
The behavior doesn't match `nix-shell` or `nix-build` exactly and this function is known not to work correctly for e.g. fixed-output derivations, content-addressed derivations, impure derivations and other special types of derivations.
|
||||
:::
|
||||
|
||||
### Arguments
|
||||
|
||||
`drv`
|
||||
|
||||
: The derivation on which to base the Docker image.
|
||||
|
||||
Adding packages to the Docker image is possible by e.g. extending the list of `nativeBuildInputs` of this derivation like
|
||||
|
||||
```nix
|
||||
buildNixShellImage {
|
||||
drv = someDrv.overrideAttrs (old: {
|
||||
nativeBuildInputs = old.nativeBuildInputs or [] ++ [
|
||||
somethingExtra
|
||||
];
|
||||
});
|
||||
# ...
|
||||
}
|
||||
```
|
||||
|
||||
Similarly, you can extend the image initialization script by extending `shellHook`
|
||||
|
||||
`name` _optional_
|
||||
|
||||
: The name of the resulting image.
|
||||
|
||||
*Default:* `drv.name + "-env"`
|
||||
|
||||
`tag` _optional_
|
||||
|
||||
: Tag of the generated image.
|
||||
|
||||
*Default:* the resulting image derivation output path's hash
|
||||
|
||||
`uid`/`gid` _optional_
|
||||
|
||||
: The user/group ID to run the container as. This is like a `nixbld` build user.
|
||||
|
||||
*Default:* 1000/1000
|
||||
|
||||
`homeDirectory` _optional_
|
||||
|
||||
: The home directory of the user the container is running as
|
||||
|
||||
*Default:* `/build`
|
||||
|
||||
`shell` _optional_
|
||||
|
||||
: The path to the `bash` binary to use as the shell. This shell is started when running the image.
|
||||
|
||||
*Default:* `pkgs.bashInteractive + "/bin/bash"`
|
||||
|
||||
`command` _optional_
|
||||
|
||||
: Run this command in the environment of the derivation, in an interactive shell. See the `--command` option in the [`nix-shell` documentation](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html?highlight=nix-shell#options).
|
||||
|
||||
*Default:* (none)
|
||||
|
||||
`run` _optional_
|
||||
|
||||
: Same as `command`, but runs the command in a non-interactive shell instead. See the `--run` option in the [`nix-shell` documentation](https://nixos.org/manual/nix/stable/command-ref/nix-shell.html?highlight=nix-shell#options).
|
||||
|
||||
*Default:* (none)
|
||||
|
||||
### Example
|
||||
|
||||
The following shows how to build the `pkgs.hello` package inside a Docker container built with `buildNixShellImage`.
|
||||
|
||||
```nix
|
||||
with import <nixpkgs> {};
|
||||
dockerTools.buildNixShellImage {
|
||||
drv = hello;
|
||||
}
|
||||
```
|
||||
|
||||
Build the derivation:
|
||||
|
||||
```console
|
||||
nix-build hello.nix
|
||||
```
|
||||
|
||||
these 8 derivations will be built:
|
||||
/nix/store/xmw3a5ln29rdalavcxk1w3m4zb2n7kk6-nix-shell-rc.drv
|
||||
...
|
||||
Creating layer 56 from paths: ['/nix/store/crpnj8ssz0va2q0p5ibv9i6k6n52gcya-stdenv-linux']
|
||||
Creating layer 57 with customisation...
|
||||
Adding manifests...
|
||||
Done.
|
||||
/nix/store/cpyn1lc897ghx0rhr2xy49jvyn52bazv-hello-2.12-env.tar.gz
|
||||
|
||||
Load the image:
|
||||
|
||||
```console
|
||||
docker load -i result
|
||||
```
|
||||
|
||||
0d9f4c4cd109: Loading layer [==================================================>] 2.56MB/2.56MB
|
||||
...
|
||||
ab1d897c0697: Loading layer [==================================================>] 10.24kB/10.24kB
|
||||
Loaded image: hello-2.12-env:pgj9h98nal555415faa43vsydg161bdz
|
||||
|
||||
Run the container:
|
||||
|
||||
```console
|
||||
docker run -it hello-2.12-env:pgj9h98nal555415faa43vsydg161bdz
|
||||
```
|
||||
|
||||
[nix-shell:/build]$
|
||||
|
||||
In the running container, run the build:
|
||||
|
||||
```console
|
||||
buildDerivation
|
||||
```
|
||||
|
||||
unpacking sources
|
||||
unpacking source archive /nix/store/8nqv6kshb3vs5q5bs2k600xpj5bkavkc-hello-2.12.tar.gz
|
||||
...
|
||||
patching script interpreter paths in /nix/store/z5wwy5nagzy15gag42vv61c2agdpz2f2-hello-2.12
|
||||
checking for references to /build/ in /nix/store/z5wwy5nagzy15gag42vv61c2agdpz2f2-hello-2.12...
|
||||
|
||||
Check the build result:
|
||||
|
||||
```console
|
||||
$out/bin/hello
|
||||
```
|
||||
|
||||
Hello, world!
|
||||
|
|
|
|||
|
|
@ -1435,7 +1435,7 @@ Superuser created successfully.
|
|||
<para>
|
||||
The default GNAT version has been changed: The
|
||||
<literal>gnat</literal> attribute now points to
|
||||
<literal>gnat11</literal> instead of <literal>gnat9</literal>.
|
||||
<literal>gnat12</literal> instead of <literal>gnat9</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
|
|
|
|||
|
|
@ -656,7 +656,7 @@
|
|||
<literal>22.11</literal>. This is to make sure that people
|
||||
using
|
||||
<link xlink:href="https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html">server-side
|
||||
encryption</link> don’t loose access to their files.
|
||||
encryption</link> don’t lose access to their files.
|
||||
</para>
|
||||
<para>
|
||||
In any other case it’s safe to use OpenSSL 3 for PHP’s openssl
|
||||
|
|
@ -709,6 +709,14 @@
|
|||
<literal>emacs-gtk</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>kanidm</literal> has been updated to 1.1.0-alpha.10
|
||||
and now requires a tls certificate and key. It will always
|
||||
start an https and – if enabled – an ldaps server and no http
|
||||
and ldap server anymore.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
riak package removed along with
|
||||
|
|
@ -1694,6 +1702,22 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
|
|||
<literal>picom</literal> to quit instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>haskellPackage.callHackage</literal> is not always
|
||||
invalidated if <literal>all-cabal-hashes</literal> changes,
|
||||
leading to less rebuilds of haskell dependencies.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>haskellPackages.callHackage</literal> and
|
||||
<literal>haskellPackages.callCabal2nix</literal> (and related
|
||||
functions) no longer keep a reference to the
|
||||
<literal>cabal2nix</literal> call used to generate them. As a
|
||||
result, they will be garbage collected more often.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -427,7 +427,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `services.ddclient.password` option was removed, and replaced with `services.ddclient.passwordFile`.
|
||||
|
||||
- The default GNAT version has been changed: The `gnat` attribute now points to `gnat11`
|
||||
- The default GNAT version has been changed: The `gnat` attribute now points to `gnat12`
|
||||
instead of `gnat9`.
|
||||
|
||||
- `retroArchCores` has been removed. This means that using `nixpkgs.config.retroarch` to customize RetroArch cores is not supported anymore. Instead, use package overrides, for example: `retroarch.override { cores = with libretro; [ citra snes9x ]; };`. Also, `retroarchFull` derivation is available for those who want to have all RetroArch cores available.
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- The `openssl`-extension for the PHP interpreter used by Nextcloud is built against OpenSSL 1.1 if
|
||||
[](#opt-system.stateVersion) is below `22.11`. This is to make sure that people using [server-side encryption](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/encryption_configuration.html)
|
||||
don't loose access to their files.
|
||||
don't lose access to their files.
|
||||
|
||||
In any other case it's safe to use OpenSSL 3 for PHP's openssl extension. This can be done by setting
|
||||
[](#opt-services.nextcloud.enableBrokenCiphersForSSE) to `false`.
|
||||
|
|
@ -231,6 +231,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
- Emacs now uses the Lucid toolkit by default instead of GTK because of stability and compatibility issues.
|
||||
Users who still wish to remain using GTK can do so by using `emacs-gtk`.
|
||||
|
||||
- `kanidm` has been updated to 1.1.0-alpha.10 and now requires a tls certificate and key. It will always start an https and – if enabled – an ldaps server and no http and ldap server anymore.
|
||||
|
||||
- riak package removed along with `services.riak` module, due to lack of maintainer to update the package.
|
||||
|
||||
- ppd files in `pkgs.cups-drv-rastertosag-gdi` are now gzipped. If you refer to such a ppd file with its path (e.g. via [hardware.printers.ensurePrinters](options.html#opt-hardware.printers.ensurePrinters)) you will need to append `.gz` to the path.
|
||||
|
|
@ -529,4 +531,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
|||
|
||||
- The option `services.picom.experimentalBackends` was removed since it is now the default and the option will cause `picom` to quit instead.
|
||||
|
||||
- `haskellPackage.callHackage` is not always invalidated if `all-cabal-hashes` changes, leading to less rebuilds of haskell dependencies.
|
||||
|
||||
- `haskellPackages.callHackage` and `haskellPackages.callCabal2nix` (and related functions) no longer keep a reference to the `cabal2nix` call used to generate them. As a result, they will be garbage collected more often.
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
|
|||
|
|
@ -100,6 +100,14 @@ in
|
|||
readOnly = true;
|
||||
type = lib.types.path;
|
||||
};
|
||||
tls_chain = lib.mkOption {
|
||||
description = lib.mdDoc "TLS chain in pem format.";
|
||||
type = lib.types.path;
|
||||
};
|
||||
tls_key = lib.mkOption {
|
||||
description = lib.mdDoc "TLS key in pem format.";
|
||||
type = lib.types.path;
|
||||
};
|
||||
log_level = lib.mkOption {
|
||||
description = lib.mdDoc "Log level of the server.";
|
||||
default = "default";
|
||||
|
|
|
|||
|
|
@ -689,6 +689,7 @@ in {
|
|||
virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {};
|
||||
vscodium = discoverTests (import ./vscodium.nix);
|
||||
vsftpd = handleTest ./vsftpd.nix {};
|
||||
warzone2100 = handleTest ./warzone2100.nix {};
|
||||
wasabibackend = handleTest ./wasabibackend.nix {};
|
||||
wiki-js = handleTest ./wiki-js.nix {};
|
||||
wine = handleTest ./wine.nix {};
|
||||
|
|
|
|||
|
|
@ -431,5 +431,58 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
docker.succeed("docker run --rm image-with-certs:latest test -r /etc/pki/tls/certs/ca-bundle.crt")
|
||||
docker.succeed("docker image rm image-with-certs:latest")
|
||||
|
||||
with subtest("buildNixShellImage: Can build a basic derivation"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-basic} | docker load",
|
||||
"docker run --rm nix-shell-basic bash -c 'buildDerivation && $out/bin/hello' | grep '^Hello, world!$'"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: Runs the shell hook"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-hook} | docker load",
|
||||
"docker run --rm -it nix-shell-hook | grep 'This is the shell hook!'"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: Sources stdenv, making build inputs available"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-inputs} | docker load",
|
||||
"docker run --rm -it nix-shell-inputs | grep 'Hello, world!'"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: passAsFile works"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-pass-as-file} | docker load",
|
||||
"docker run --rm -it nix-shell-pass-as-file | grep 'this is a string'"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: run argument works"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-run} | docker load",
|
||||
"docker run --rm -it nix-shell-run | grep 'This shell is not interactive'"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: command argument works"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-command} | docker load",
|
||||
"docker run --rm -it nix-shell-command | grep 'This shell is interactive'"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: home directory is writable by default"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-writable-home} | docker load",
|
||||
"docker run --rm -it nix-shell-writable-home"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: home directory can be made non-existent"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-nonexistent-home} | docker load",
|
||||
"docker run --rm -it nix-shell-nonexistent-home"
|
||||
)
|
||||
|
||||
with subtest("buildNixShellImage: can build derivations"):
|
||||
docker.succeed(
|
||||
"${examples.nix-shell-build-derivation} | docker load",
|
||||
"docker run --rm -it nix-shell-build-derivation"
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -13,26 +13,17 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
serverSettings = {
|
||||
origin = "https://${serverDomain}";
|
||||
domain = serverDomain;
|
||||
bindaddress = "[::1]:8443";
|
||||
bindaddress = "[::]:443";
|
||||
ldapbindaddress = "[::1]:636";
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedProxySettings = true;
|
||||
virtualHosts."${serverDomain}" = {
|
||||
forceSSL = true;
|
||||
sslCertificate = certs."${serverDomain}".cert;
|
||||
sslCertificateKey = certs."${serverDomain}".key;
|
||||
locations."/".proxyPass = "http://[::1]:8443";
|
||||
tls_chain = certs."${serverDomain}".cert;
|
||||
tls_key = certs."${serverDomain}".key;
|
||||
};
|
||||
};
|
||||
|
||||
security.pki.certificateFiles = [ certs.ca.cert ];
|
||||
|
||||
networking.hosts."::1" = [ serverDomain ];
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
networking.firewall.allowedTCPPorts = [ 443 ];
|
||||
|
||||
users.users.kanidm.shell = pkgs.bashInteractive;
|
||||
|
||||
|
|
@ -73,7 +64,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
|||
start_all()
|
||||
server.wait_for_unit("kanidm.service")
|
||||
server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm")
|
||||
server.succeed("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'")
|
||||
server.succeed("ldapsearch -H ldaps://${serverDomain}:636 -b '${ldapBaseDN}' -x '(name=test)'")
|
||||
client.succeed("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}")
|
||||
rv, result = server.execute("kanidmd recover_account -c ${serverConfigFile} idm_admin 2>&1 | rg -o '[A-Za-z0-9]{48}'")
|
||||
assert rv == 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
f: {
|
||||
system ? builtins.currentSystem,
|
||||
pkgs ? import ../.. { inherit system; },
|
||||
pkgs ? import ../.. { inherit system; config = {}; overlays = []; },
|
||||
...
|
||||
} @ args:
|
||||
|
||||
|
|
|
|||
|
|
@ -61,5 +61,10 @@ in {
|
|||
|
||||
phone.wait_for_text("All Apps")
|
||||
phone.screenshot("03launcher")
|
||||
|
||||
with subtest("Check the on-screen keyboard shows"):
|
||||
phone.send_chars("setting", delay=0.2)
|
||||
phone.wait_for_text("123") # A button on the OSK
|
||||
phone.screenshot("04osk")
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
26
nixos/tests/warzone2100.nix
Normal file
26
nixos/tests/warzone2100.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "warzone2100";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
imports = [
|
||||
./common/x11.nix
|
||||
];
|
||||
|
||||
services.xserver.enable = true;
|
||||
environment.systemPackages = [ pkgs.warzone2100 ];
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
|
||||
testScript =
|
||||
''
|
||||
machine.wait_for_x()
|
||||
machine.execute("warzone2100 >&2 &")
|
||||
machine.wait_for_window("Warzone 2100")
|
||||
machine.wait_for_text(r"(Single Player|Multi Player|Tutorial|Options|Quit Game)")
|
||||
machine.screenshot("screen")
|
||||
'';
|
||||
})
|
||||
|
|
@ -16,6 +16,7 @@
|
|||
, feedbackd
|
||||
, wrapGAppsHook
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -68,6 +69,8 @@ stdenv.mkDerivation rec {
|
|||
feedbackd
|
||||
];
|
||||
|
||||
passthru.tests.phosh = nixosTests.phosh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A virtual keyboard supporting Wayland";
|
||||
homepage = "https://source.puri.sm/Librem5/squeekboard";
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i 's@/usr/bin/install@install@g' Makefile
|
||||
sed -i 's@/bin/rm@rm@g' Makefile
|
||||
sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile
|
||||
sed -i 's@g++@$(CXX)@g' Makefile
|
||||
'';
|
||||
|
||||
preInstall="mkdir -p $out/lib/ladspa";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }:
|
||||
{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "jackmix";
|
||||
|
|
@ -11,9 +13,16 @@ mkDerivation rec {
|
|||
sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
|
||||
};
|
||||
|
||||
patches = [ ./no_error.patch ];
|
||||
patches = [
|
||||
./no_error.patch
|
||||
(fetchpatch {
|
||||
name = "sconstruct-python3.patch";
|
||||
url = "https://github.com/kampfschlaefer/jackmix/commit/3a0c868b267728fdbc69cc3dc1941edac27d97f6.patch";
|
||||
hash = "sha256-MLgxIiZ0+C1IVEci9Q347DR+SJUlPG2N3iPvuhRptJU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ];
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest pkg-config ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
lash
|
||||
|
|
|
|||
|
|
@ -1,19 +1,34 @@
|
|||
{ lib, stdenv, fetchurl, sconsPackages, pkg-config
|
||||
, libsamplerate, libsndfile, liblo, libjack2, boost }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, sconsPackages
|
||||
, rubberband
|
||||
, boost
|
||||
, libjack2
|
||||
, liblo
|
||||
, libsamplerate
|
||||
, libsndfile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "klick";
|
||||
version = "0.12.2";
|
||||
version = "0.14.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Allfifthstuning";
|
||||
repo = "klick";
|
||||
rev = version;
|
||||
hash = "sha256-jHyeVCmyy9ipbVaF7GSW19DOVpU9EQJoLcGq9uos+eY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
rubberband
|
||||
sconsPackages.scons_latest
|
||||
];
|
||||
buildInputs = [ libsamplerate libsndfile liblo libjack2 boost ];
|
||||
prefixKey = "PREFIX=";
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
meta = {
|
||||
homepage = "http://das.nasophon.de/klick/";
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "miniplayer";
|
||||
version = "1.7.3";
|
||||
version = "1.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GxbsDIZ5LvxMqbDC81rerrk0mn94qHlX1uxrNL+vxSU=";
|
||||
hash = "sha256-iUUsVIDLQAiaMomfA2LvvJZ2ePhgADtC6GCwIpRC1MA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ buildNpmPackage rec {
|
|||
hash = "sha256-XgwlRdwUSl4gIRKqk6BnMAKarVvp291zk8vmNkuRWKo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Use generated package-lock.json since upstream does not provide one in releases
|
||||
./package-lock.json.patch
|
||||
];
|
||||
# Use generated package-lock.json since upstream does not provide one in releases
|
||||
postPatch = ''
|
||||
ln -sT ${./package-lock.json} ./package-lock.json
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-5KZXZ4agHcAh3gai5w9YodETIEGJtDq/kyEZOHb9dOc=";
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ buildNpmPackage rec {
|
|||
runHook preInstall
|
||||
|
||||
# prune unused deps
|
||||
npm prune --omit dev $npmFlags
|
||||
npm prune --omit dev --no-save $npmFlags
|
||||
|
||||
# copy built app and node_modules directories
|
||||
mkdir -p $out/lib/node_modules/open-stage-control
|
||||
|
|
|
|||
18244
pkgs/applications/audio/open-stage-control/package-lock.json
generated
Normal file
18244
pkgs/applications/audio/open-stage-control/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -47,10 +47,7 @@ curl -sSL https://raw.githubusercontent.com/jean-emmanuel/open-stage-control/v"$
|
|||
# Lock dependencies with npm
|
||||
(cd "$pkgdir" && npm install --package-lock-only --ignore-scripts --legacy-peer-deps)
|
||||
|
||||
# Turn lock file into patch file
|
||||
(cd "$pkgdir" && (diff -u /dev/null ./package-lock.json || [ $? -eq 1 ])) >"$pkgdir"/package-lock.json.patch
|
||||
|
||||
rm -f "$pkgdir"/{package.json,package-lock.json}
|
||||
rm -f "$pkgdir"/package.json
|
||||
|
||||
# Update FOD hash
|
||||
curhash="$(nixeval "$attr.npmDeps.outputHash")"
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "charge-lnd";
|
||||
version = "0.2.12";
|
||||
version = "0.2.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "accumulator";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "uiXmLdQAglgLxOX6IoF1iNZvje4EM7Tr25Okx9TPyzI=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-mNU8bhiZqvYbNUU8vJNk9WbpAVrCTi9Fy3hlIpb06ac=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "llama";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = "llama";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/YnaKodMkuHrB0xH1UNRq+a6VknKRqcbBIehaYM6Gyc=";
|
||||
sha256 = "sha256-32UyFy269rifw4Hjw18FO0F79sDNW8dgJ2MdGXSzLWo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, perl
|
||||
, makeWrapper
|
||||
, writeText
|
||||
, jdk11
|
||||
, jdk
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeWrapper $out/share/mucommander/mucommander.sh $out/bin/mucommander \
|
||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
|
||||
--set JAVA_HOME ${jdk11}
|
||||
--set JAVA_HOME ${jdk}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ascii-image-converter";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheZoraiz";
|
||||
repo = "ascii-image-converter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2kg5W5u6YjLce3wNS3A1e89ZYAVK2LyNmPGCm86HxPM=";
|
||||
sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs=";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
pname = "feedbackd";
|
||||
# Not an actual upstream project release,
|
||||
# only a Debian package release that is tagged in the upstream repo
|
||||
version = "0.0.0+git20220520";
|
||||
version = "0.0.1";
|
||||
|
||||
outputs = [ "out" "dev" ]
|
||||
# remove if cross-compiling gobject-introspection works
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "Librem5";
|
||||
repo = "feedbackd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4ftPC6LnX0kKFYVyH85yCH43B3YjuaZM5rzr8TGgZvc=";
|
||||
hash = "sha256-l1FhECLPq8K9lzQ50sI/aH7fwR9xW1ATyk7EWRmLzuQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/applications/misc/gostatic/default.nix
Normal file
25
pkgs/applications/misc/gostatic/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gostatic";
|
||||
version = "2.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "piranha";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-pxk9tauB7u0oe6g4maHh+dREZXKwMz44v3KB43yYW6c=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-9YCt9crLuYjd+TUXJyx/EAYIMWM5TD+ZyzLeu0RMxVc=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast static site generator";
|
||||
homepage = "https://github.com/piranha/gostatic";
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ urandom ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,32 +1,38 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildGoModule
|
||||
, unixODBC
|
||||
, icu
|
||||
, nix-update-script
|
||||
, testers
|
||||
, usql
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "usql";
|
||||
version = "0.12.13";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xo";
|
||||
repo = "usql";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-F/eOD7/w8HjJBeiXagaf4yBLZcZVuy93rfVFeSESlZo=";
|
||||
hash = "sha256-bdejXGyvY+HAE4sOxhsZYZ5fCISEVxvfOlEjL/CgBLQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7rMCqTfUs89AX0VP689BmKsuvLJWU5ANJVki+JMVf7g=";
|
||||
|
||||
buildInputs = [ unixODBC icu ];
|
||||
|
||||
# Exclude broken impala driver
|
||||
# The driver breaks too often and is not used.
|
||||
vendorHash = "sha256-+4eRdr5MY9d0ordaDv8hZf4wGoZsp14MpOEp1vhr75w=";
|
||||
proxyVendor = true;
|
||||
|
||||
# Exclude broken impala & hive driver
|
||||
# These drivers break too often and are not used.
|
||||
#
|
||||
# See https://github.com/xo/usql/pull/347
|
||||
#
|
||||
excludedPackages = [
|
||||
"impala"
|
||||
"hive"
|
||||
];
|
||||
|
||||
# These tags and flags are copied from build-release.sh
|
||||
|
|
@ -52,9 +58,21 @@ buildGoModule rec {
|
|||
# All the checks currently require docker instances to run the databases.
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
tests.version = testers.testVersion {
|
||||
inherit version;
|
||||
package = usql;
|
||||
command = "usql --version";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Universal command-line interface for SQL databases";
|
||||
homepage = "https://github.com/xo/usql";
|
||||
changelog = "https://github.com/xo/usql/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ georgyo anthonyroussel ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@
|
|||
, enableTUI ? false, ncurses, sealcurses
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lagrange";
|
||||
version = "1.13.8";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "skyjake";
|
||||
repo = "lagrange";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SdncFkMCAY28njw361R70h6gcK0YHSU7AUwf9wzxCRo=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-xS6cyramlcItjRBSSunzm39zcGXdX9s/pvi0tsaTkW8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config zip ];
|
||||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
attrPath = finalAttrs.pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -62,4 +62,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
|
||||
|
||||
let
|
||||
version = "0.36.0";
|
||||
sha256 = "1rjsdisj2cib8pyfc1lx5jgx0dksh0zhiqccgvqvfja24azvhc4n";
|
||||
manifestsSha256 = "0kzbzn43i35kyl7h9kb4f21sbrz90jx9pj35002j2i1j20b2xzh8";
|
||||
version = "0.37.0";
|
||||
sha256 = "10f0k6k02n981vf0bjh70qf4kdax2qc40ld278p7mrsqri38r1q9";
|
||||
manifestsSha256 = "0srg7184sb1brxj8kzzf0ilmx5ym96h78v919xcmbdd6v4f2ycy9";
|
||||
|
||||
manifests = fetchzip {
|
||||
url =
|
||||
|
|
@ -23,7 +23,7 @@ in buildGoModule rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-2N91+anR0nD9E563MgSQPwslR9J/uvSHLs6kD4Yc3So=";
|
||||
vendorSha256 = "sha256-zB7Fo+Lw0+hWuzkYLDb9I+swhm9kGfjYNkU96hF6QTg=";
|
||||
|
||||
postUnpack = ''
|
||||
cp -r ${manifests} source/cmd/flux/manifests
|
||||
|
|
|
|||
|
|
@ -62,8 +62,8 @@ rec {
|
|||
};
|
||||
|
||||
kops_1_25 = mkKops rec {
|
||||
version = "1.25.2";
|
||||
sha256 = "sha256-JJGb12uuOvZQ+bA82nrs9vKRT2hEvnPrOH8XNHfYVD8=";
|
||||
version = "1.25.3";
|
||||
sha256 = "sha256-Q40d62D+H7CpLmrjweCy75U3LgnHEV2pFZs2Ze+koqo=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -432,13 +432,13 @@
|
|||
"version": "5.9.1"
|
||||
},
|
||||
"gitlab": {
|
||||
"hash": "sha256-1Ljf9kwpj96mzu/uHqitYCKIixNn/sZL21zOM8xQsU4=",
|
||||
"hash": "sha256-lNEkUleH0Y3ZQnHqu8cEIGdigqrbRkVRg+9kOk8kU3c=",
|
||||
"owner": "gitlabhq",
|
||||
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v3.19.0",
|
||||
"vendorHash": "sha256-e9J4g5ZuiKcI/WSXMFY3Qglgt87qbXv7tDpxYbRRuaU=",
|
||||
"version": "3.19.0"
|
||||
"rev": "v3.20.0",
|
||||
"vendorHash": "sha256-QAFx/Ew86T4LWJ6ZtJTUWwR5rGunWj0E5Vzt++BN9ks=",
|
||||
"version": "3.20.0"
|
||||
},
|
||||
"google": {
|
||||
"hash": "sha256-e2jVnL13j4iSb288CB/H6G3vR58bjwi+2ZHzve1tuUo=",
|
||||
|
|
@ -1204,13 +1204,13 @@
|
|||
"version": "3.11.0"
|
||||
},
|
||||
"vcd": {
|
||||
"hash": "sha256-qEElcMl6tCBfOTTTpTFjVYg6E6K9iTXfgmDDozrgNVg=",
|
||||
"hash": "sha256-/Xb9SzOT300SkJU6Lrk6weastVQiGn6FslziXe85hQ0=",
|
||||
"owner": "vmware",
|
||||
"provider-source-address": "registry.terraform.io/vmware/vcd",
|
||||
"repo": "terraform-provider-vcd",
|
||||
"rev": "v3.7.0",
|
||||
"vendorHash": "sha256-u5W7zeOv53VAr4M5T2AAVFRDF/6PNhSm1A2WFo6pnJU=",
|
||||
"version": "3.7.0"
|
||||
"rev": "v3.8.0",
|
||||
"vendorHash": "sha256-UHSrQsu59Lr0s1YQ4rv7KT5e20Tz/qhGGl1sv7Dl1Dc=",
|
||||
"version": "3.8.0"
|
||||
},
|
||||
"venafi": {
|
||||
"hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, fetchurl
|
||||
, openjdk
|
||||
, libnotify
|
||||
, makeWrapper
|
||||
, tor
|
||||
, p7zip
|
||||
|
|
@ -18,14 +19,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "briar-desktop";
|
||||
version = "0.2.1-beta";
|
||||
version = "0.3.1-beta";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://code.briarproject.org/briar/briar-desktop/-/jobs/18424/artifacts/download?file_type=archive";
|
||||
sha256 = "sha256-ivMbgo0+iZE4/Iffq9HUBErGIQMVLrRZUQ6R3V3X8II=";
|
||||
extension = "zip";
|
||||
src = fetchurl {
|
||||
url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar";
|
||||
sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
p7zip
|
||||
|
|
@ -33,9 +35,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,lib}
|
||||
cp ${src}/briar-desktop.jar $out/lib/
|
||||
cp ${src} $out/lib/briar-desktop.jar
|
||||
makeWrapper ${openjdk}/bin/java $out/bin/briar-desktop \
|
||||
--add-flags "-jar $out/lib/briar-desktop.jar"
|
||||
--add-flags "-jar $out/lib/briar-desktop.jar" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
|
||||
libnotify
|
||||
]}"
|
||||
'';
|
||||
|
||||
fixupPhase = ''
|
||||
|
|
|
|||
|
|
@ -13,28 +13,22 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gomuks";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c=";
|
||||
sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE=";
|
||||
vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ olm ];
|
||||
|
||||
# Upstream issue: https://github.com/tulir/gomuks/issues/260
|
||||
patches = lib.optional stdenv.isLinux (substituteAll {
|
||||
src = ./hardcoded_path.patch;
|
||||
soundTheme = sound-theme-freedesktop;
|
||||
});
|
||||
|
||||
postInstall = ''
|
||||
cp -r ${
|
||||
makeDesktopItem {
|
||||
|
|
@ -49,7 +43,9 @@ buildGoModule rec {
|
|||
}/* $out/
|
||||
substituteAllInPlace $out/share/applications/*
|
||||
wrapProgram $out/bin/gomuks \
|
||||
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}"
|
||||
--prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \
|
||||
--set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \
|
||||
--set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go
|
||||
index 7f102b8..996c15f 100644
|
||||
--- a/lib/notification/notify_xdg.go
|
||||
+++ b/lib/notification/notify_xdg.go
|
||||
@@ -26,8 +26,8 @@ import (
|
||||
var notifySendPath string
|
||||
var audioCommand string
|
||||
var tryAudioCommands = []string{"ogg123", "paplay"}
|
||||
-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga"
|
||||
-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga"
|
||||
+var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga"
|
||||
+var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga"
|
||||
|
||||
func getSoundPath(env, defaultPath string) string {
|
||||
if path, ok := os.LookupEnv(env); ok {
|
||||
|
|
@ -1,20 +1,41 @@
|
|||
{ lib, stdenv, fetchurl, pidgin, intltool, python2 } :
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, meson
|
||||
, ninja
|
||||
, pidgin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "purple-plugin-pack";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/purple-plugin-pack-${version}.tar.bz2";
|
||||
sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
|
||||
url = "mirror://sourceforge/pidgin/purple-plugin-pack-2.8.0.tar.xz";
|
||||
hash = "sha256-gszemnJRp1t+A6P5qSkBTY4AjBtvRuWGOPX0dto+JC0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ intltool ];
|
||||
buildInputs = [ pidgin python2 ];
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "PURPLE.get_pkgconfig_variable('plugindir')" "'$out/lib/purple-2'" \
|
||||
--replace "PURPLE.get_pkgconfig_variable('datadir')" "'$out/share'" \
|
||||
--replace "PIDGIN.get_pkgconfig_variable('plugindir')" "'$out/lib/pidgin'" \
|
||||
--replace "PIDGIN.get_pkgconfig_variable('datadir')" "'$out/share'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
pidgin
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";
|
||||
description = "Plugin pack for Pidgin 2.x";
|
||||
license = licenses.gpl2;
|
||||
homepage = "https://keep.imfreedom.org/pidgin/purple-plugin-pack";
|
||||
description = "Collection of plugins for purple-based clients such as Pidgin";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bdimcheff ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus
|
||||
, sqlite, libsoup, libnice, gnutls}:
|
||||
{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python3, libxml2, dbus-glib, dbus
|
||||
, sqlite, libsoup, libnice, gnutls
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-gabble";
|
||||
|
|
@ -10,8 +12,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt ];
|
||||
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/edcf78c831894000f2fbfd3e5818e363911c746a/trunk/telepathy-gabble-0.18.4-python3.patch";
|
||||
hash = "sha256-bvcZW6gbCNogqwPDaXHTbohe7c2GAYjXeHGyBEDVsB4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt python3 ];
|
||||
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ];
|
||||
|
||||
checkInputs = [ dbus.daemon ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-haze";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze${version}.tar.gz";
|
||||
sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy";
|
||||
url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz";
|
||||
hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib pidgin ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config libxslt ];
|
||||
|
||||
patches = [
|
||||
# Patch from Gentoo that helps telepathy-haze build with more
|
||||
# recent versions of pidgin.
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch";
|
||||
sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ pkg-config libxslt python3 ];
|
||||
|
||||
meta = {
|
||||
description = "A Telepathy connection manager based on libpurple";
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }:
|
||||
{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python3, libxslt, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-idle";
|
||||
version = "0.2.0";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
|
||||
hash = "sha256-g4fiXl+wtMvnAeXcCS1mbWUQuDP9Pn5GLpFw027DwV8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ];
|
||||
nativeBuildInputs = [ pkg-config python3 makeWrapper ];
|
||||
buildInputs = [ glib telepathy-glib dbus-glib libxslt (lib.getLib dconf) ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/libexec/telepathy-idle" \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config
|
||||
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }:
|
||||
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config
|
||||
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telepathy-logger";
|
||||
|
|
@ -10,12 +12,20 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/archlinux/svntogit-packages/raw/2b5bdbb4739d3517f5e7300edc8dab775743b96d/trunk/0001-tools-Fix-the-build-with-Python-3.patch";
|
||||
hash = "sha256-o1lfdZIIqaxn7ntQZnoOMqquc6efTHgSIxB5dpFWRgg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper pkg-config intltool libxslt gobject-introspection
|
||||
python3
|
||||
];
|
||||
buildInputs = [
|
||||
dbus-glib libxml2 sqlite telepathy-glib
|
||||
dbus python2
|
||||
dbus
|
||||
];
|
||||
|
||||
configureFlags = [ "--enable-call" ];
|
||||
|
|
|
|||
|
|
@ -9,18 +9,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.10.4";
|
||||
version = "0.10.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${version}";
|
||||
sha256 = "ov1hA+3sKh9Ms5D3/+ubwcAp+skuIfB3pvsvNSUKiSE=";
|
||||
sha256 = "BtD22Ss5PuVx2RVLQIsUeGBJBl5lh1XHJ0vcM2bOEwk=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorSha256 = "sha256-IYDy3teo+hm+yEfZa9V9MFNGmO2tqeh3lAq+Eh4Ek+A=";
|
||||
vendorSha256 = "sha256-tvKiTQioj999oIUDHUSXTMXOh/LKoykzu8JEUnrelws=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, python3
|
||||
, pkg-config
|
||||
, libuuid
|
||||
, openjdk11
|
||||
, openjdk
|
||||
, gperftools
|
||||
, flatbuffers
|
||||
, fetchpatch
|
||||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
openjdk11
|
||||
openjdk
|
||||
(python3.withPackages (p: with p; [
|
||||
psutil
|
||||
orderedmultidict
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.7";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Ly6GBR7nF7J5Dwe1jrQxR4XYsao7KxBAxGn8fsJwmMs=";
|
||||
sha256 = "sha256-YCymMr2dxDACdBNylPXa0GKu+QRzKFi5QzlyacAyE5A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
@ -55,6 +55,8 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
strictDeps = true;
|
||||
|
||||
NIX_LDFLAGS = "-lcriu";
|
||||
|
||||
# we need this before autoreconfHook does its thing in order to initialize
|
||||
# config.h with the correct values
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ fetchurl, lib, stdenv }:
|
||||
|
||||
let
|
||||
version = "1.1.2";
|
||||
version = "1.1.3";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
suffix = {
|
||||
x86_64-linux = "x86_64";
|
||||
|
|
@ -22,8 +23,8 @@ stdenv.mkDerivation {
|
|||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-RkFlc+atTB9zHRAjQSqe4nJ9N7I9FE/RBeEcXoCk0T8=";
|
||||
aarch64-linux = "sha256-AqVFqUbMtjPmOsSgAaJ2AFNc0McC708fAD36qLz0VAc=";
|
||||
x86_64-linux = "sha256-3+CqVBOb2haknQIMzE9kl99pDWm9wZPUX92FlVov3No=";
|
||||
aarch64-linux = "sha256-ii+x4YEZIZJuM+1Njvxe1dz6WOvAK1SWqfuodC7a4yo=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, libgudev
|
||||
, callaudiod
|
||||
, pulseaudio
|
||||
, evince
|
||||
, glib
|
||||
, gtk3
|
||||
, gnome
|
||||
|
|
@ -33,7 +34,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh";
|
||||
version = "0.21.1";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
|
|
@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
repo = pname;
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-I0BWwEKvOYQ1s2IpvV70GWxhARdX6AZ+B4ypnTlLlDw=";
|
||||
sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
evince
|
||||
phoc
|
||||
libhandy
|
||||
libsecret
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, desktop-file-utils
|
||||
, feedbackd
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, lm_sensors
|
||||
, phoc
|
||||
, phosh
|
||||
, wayland-protocols
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phosh-mobile-settings";
|
||||
version = "0.21.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "guidog";
|
||||
repo = "phosh-mobile-settings";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
desktop-file-utils
|
||||
feedbackd
|
||||
gtk4
|
||||
libadwaita
|
||||
lm_sensors
|
||||
phoc
|
||||
phosh
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# this is optional, but without it phosh-mobile-settings won't know about lock screen plugins
|
||||
ln -s '${phosh}/lib/phosh' "$out/lib/phosh"
|
||||
|
||||
# .desktop files marked `OnlyShowIn=Phosh;` aren't displayed even in our phosh, so remove that.
|
||||
# also make the Exec path absolute.
|
||||
substituteInPlace "$out/share/applications/org.sigxcpu.MobileSettings.desktop" \
|
||||
--replace 'OnlyShowIn=Phosh;' "" \
|
||||
--replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A settings app for mobile specific things";
|
||||
homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ colinsane ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -19,6 +19,7 @@
|
|||
, pigz
|
||||
, rsync
|
||||
, runCommand
|
||||
, runCommandNoCC
|
||||
, runtimeShell
|
||||
, shadow
|
||||
, skopeo
|
||||
|
|
@ -30,6 +31,7 @@
|
|||
, vmTools
|
||||
, writeReferencesToFile
|
||||
, writeScript
|
||||
, writeShellScriptBin
|
||||
, writeText
|
||||
, writeTextDir
|
||||
, writePython3
|
||||
|
|
@ -78,7 +80,7 @@ let
|
|||
in
|
||||
rec {
|
||||
examples = callPackage ./examples.nix {
|
||||
inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb;
|
||||
inherit buildImage buildLayeredImage fakeNss pullImage shadowSetup buildImageWithNixDb streamNixShellImage;
|
||||
};
|
||||
|
||||
tests = {
|
||||
|
|
@ -1034,4 +1036,188 @@ rec {
|
|||
'';
|
||||
in
|
||||
result;
|
||||
|
||||
# This function streams a docker image that behaves like a nix-shell for a derivation
|
||||
streamNixShellImage =
|
||||
{ # The derivation whose environment this docker image should be based on
|
||||
drv
|
||||
, # Image Name
|
||||
name ? drv.name + "-env"
|
||||
, # Image tag, the Nix's output hash will be used if null
|
||||
tag ? null
|
||||
, # User id to run the container as. Defaults to 1000, because many
|
||||
# binaries don't like to be run as root
|
||||
uid ? 1000
|
||||
, # Group id to run the container as, see also uid
|
||||
gid ? 1000
|
||||
, # The home directory of the user
|
||||
homeDirectory ? "/build"
|
||||
, # The path to the bash binary to use as the shell. See `NIX_BUILD_SHELL` in `man nix-shell`
|
||||
shell ? bashInteractive + "/bin/bash"
|
||||
, # Run this command in the environment of the derivation, in an interactive shell. See `--command` in `man nix-shell`
|
||||
command ? null
|
||||
, # Same as `command`, but runs the command in a non-interactive shell instead. See `--run` in `man nix-shell`
|
||||
run ? null
|
||||
}:
|
||||
assert lib.assertMsg (! (drv.drvAttrs.__structuredAttrs or false))
|
||||
"streamNixShellImage: Does not work with the derivation ${drv.name} because it uses __structuredAttrs";
|
||||
assert lib.assertMsg (command == null || run == null)
|
||||
"streamNixShellImage: Can't specify both command and run";
|
||||
let
|
||||
|
||||
# A binary that calls the command to build the derivation
|
||||
builder = writeShellScriptBin "buildDerivation" ''
|
||||
exec ${lib.escapeShellArg (stringValue drv.drvAttrs.builder)} ${lib.escapeShellArgs (map stringValue drv.drvAttrs.args)}
|
||||
'';
|
||||
|
||||
staticPath = "${dirOf shell}:${lib.makeBinPath [ builder ]}";
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L493-L526
|
||||
rcfile = writeText "nix-shell-rc" ''
|
||||
unset PATH
|
||||
dontAddDisableDepTrack=1
|
||||
# TODO: https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L506
|
||||
[ -e $stdenv/setup ] && source $stdenv/setup
|
||||
PATH=${staticPath}:"$PATH"
|
||||
SHELL=${lib.escapeShellArg shell}
|
||||
BASH=${lib.escapeShellArg shell}
|
||||
set +e
|
||||
[ -n "$PS1" -a -z "$NIX_SHELL_PRESERVE_PROMPT" ] && PS1='\n\[\033[1;32m\][nix-shell:\w]\$\[\033[0m\] '
|
||||
if [ "$(type -t runHook)" = function ]; then
|
||||
runHook shellHook
|
||||
fi
|
||||
unset NIX_ENFORCE_PURITY
|
||||
shopt -u nullglob
|
||||
shopt -s execfail
|
||||
${optionalString (command != null || run != null) ''
|
||||
${optionalString (command != null) command}
|
||||
${optionalString (run != null) run}
|
||||
exit
|
||||
''}
|
||||
'';
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/globals.hh#L464-L465
|
||||
sandboxBuildDir = "/build";
|
||||
|
||||
# This function closely mirrors what this Nix code does:
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1102
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/eval.cc#L1981-L2036
|
||||
stringValue = value:
|
||||
# We can't just use `toString` on all derivation attributes because that
|
||||
# would not put path literals in the closure. So we explicitly copy
|
||||
# those into the store here
|
||||
if builtins.typeOf value == "path" then "${value}"
|
||||
else if builtins.typeOf value == "list" then toString (map stringValue value)
|
||||
else toString value;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L992-L1004
|
||||
drvEnv = lib.mapAttrs' (name: value:
|
||||
let str = stringValue value;
|
||||
in if lib.elem name (drv.drvAttrs.passAsFile or [])
|
||||
then lib.nameValuePair "${name}Path" (writeText "pass-as-text-${name}" str)
|
||||
else lib.nameValuePair name str
|
||||
) drv.drvAttrs //
|
||||
# A mapping from output name to the nix store path where they should end up
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libexpr/primops.cc#L1253
|
||||
lib.genAttrs drv.outputs (output: builtins.unsafeDiscardStringContext drv.${output}.outPath);
|
||||
|
||||
# Environment variables set in the image
|
||||
envVars = {
|
||||
|
||||
# Root certificates for internet access
|
||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1027-L1030
|
||||
# PATH = "/path-not-set";
|
||||
# Allows calling bash and `buildDerivation` as the Cmd
|
||||
PATH = staticPath;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1032-L1038
|
||||
HOME = homeDirectory;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1040-L1044
|
||||
NIX_STORE = storeDir;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1046-L1047
|
||||
# TODO: Make configurable?
|
||||
NIX_BUILD_CORES = "1";
|
||||
|
||||
} // drvEnv // {
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1008-L1010
|
||||
NIX_BUILD_TOP = sandboxBuildDir;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1012-L1013
|
||||
TMPDIR = sandboxBuildDir;
|
||||
TEMPDIR = sandboxBuildDir;
|
||||
TMP = sandboxBuildDir;
|
||||
TEMP = sandboxBuildDir;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1015-L1019
|
||||
PWD = sandboxBuildDir;
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1071-L1074
|
||||
# We don't set it here because the output here isn't handled in any special way
|
||||
# NIX_LOG_FD = "2";
|
||||
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/libstore/build/local-derivation-goal.cc#L1076-L1077
|
||||
TERM = "xterm-256color";
|
||||
};
|
||||
|
||||
|
||||
in streamLayeredImage {
|
||||
inherit name tag;
|
||||
contents = [
|
||||
binSh
|
||||
usrBinEnv
|
||||
(fakeNss.override {
|
||||
# Allows programs to look up the build user's home directory
|
||||
# https://github.com/NixOS/nix/blob/ffe155abd36366a870482625543f9bf924a58281/src/libstore/build/local-derivation-goal.cc#L906-L910
|
||||
# Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir.
|
||||
# We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379
|
||||
extraPasswdLines = [
|
||||
"nixbld:x:${toString uid}:${toString gid}:Build user:${homeDirectory}:/noshell"
|
||||
];
|
||||
extraGroupLines = [
|
||||
"nixbld:!:${toString gid}:"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
fakeRootCommands = ''
|
||||
# Effectively a single-user installation of Nix, giving the user full
|
||||
# control over the Nix store. Needed for building the derivation this
|
||||
# shell is for, but also in case one wants to use Nix inside the
|
||||
# image
|
||||
mkdir -p ./nix/{store,var/nix} ./etc/nix
|
||||
chown -R ${toString uid}:${toString gid} ./nix ./etc/nix
|
||||
|
||||
# Gives the user control over the build directory
|
||||
mkdir -p .${sandboxBuildDir}
|
||||
chown -R ${toString uid}:${toString gid} .${sandboxBuildDir}
|
||||
'';
|
||||
|
||||
# Run this image as the given uid/gid
|
||||
config.User = "${toString uid}:${toString gid}";
|
||||
config.Cmd =
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L185-L186
|
||||
# https://github.com/NixOS/nix/blob/2.8.0/src/nix-build/nix-build.cc#L534-L536
|
||||
if run == null
|
||||
then [ shell "--rcfile" rcfile ]
|
||||
else [ shell rcfile ];
|
||||
config.WorkingDir = sandboxBuildDir;
|
||||
config.Env = lib.mapAttrsToList (name: value: "${name}=${value}") envVars;
|
||||
};
|
||||
|
||||
# Wrapper around streamNixShellImage to build an image from the result
|
||||
buildNixShellImage = { drv, ... }@args:
|
||||
let
|
||||
stream = streamNixShellImage args;
|
||||
in
|
||||
runCommand "${drv.name}-env.tar.gz"
|
||||
{
|
||||
inherit (stream) imageName;
|
||||
passthru = { inherit (stream) imageTag; };
|
||||
nativeBuildInputs = [ pigz ];
|
||||
} "${stream} | pigz -nT > $out";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# $ nix-build '<nixpkgs>' -A dockerTools.examples.redis
|
||||
# $ docker load < result
|
||||
|
||||
{ pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }:
|
||||
{ pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross, streamNixShellImage }:
|
||||
|
||||
let
|
||||
nixosLib = import ../../../nixos/lib {
|
||||
|
|
@ -715,4 +715,118 @@ rec {
|
|||
config = {
|
||||
};
|
||||
};
|
||||
|
||||
nix-shell-basic = streamNixShellImage {
|
||||
name = "nix-shell-basic";
|
||||
tag = "latest";
|
||||
drv = pkgs.hello;
|
||||
};
|
||||
|
||||
nix-shell-hook = streamNixShellImage {
|
||||
name = "nix-shell-hook";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {
|
||||
shellHook = ''
|
||||
echo "This is the shell hook!"
|
||||
exit
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
nix-shell-inputs = streamNixShellImage {
|
||||
name = "nix-shell-inputs";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {
|
||||
nativeBuildInputs = [
|
||||
pkgs.hello
|
||||
];
|
||||
};
|
||||
command = ''
|
||||
hello
|
||||
'';
|
||||
};
|
||||
|
||||
nix-shell-pass-as-file = streamNixShellImage {
|
||||
name = "nix-shell-pass-as-file";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {
|
||||
str = "this is a string";
|
||||
passAsFile = [ "str" ];
|
||||
};
|
||||
command = ''
|
||||
cat "$strPath"
|
||||
'';
|
||||
};
|
||||
|
||||
nix-shell-run = streamNixShellImage {
|
||||
name = "nix-shell-run";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {};
|
||||
run = ''
|
||||
case "$-" in
|
||||
*i*) echo This shell is interactive ;;
|
||||
*) echo This shell is not interactive ;;
|
||||
esac
|
||||
'';
|
||||
};
|
||||
|
||||
nix-shell-command = streamNixShellImage {
|
||||
name = "nix-shell-command";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {};
|
||||
command = ''
|
||||
case "$-" in
|
||||
*i*) echo This shell is interactive ;;
|
||||
*) echo This shell is not interactive ;;
|
||||
esac
|
||||
'';
|
||||
};
|
||||
|
||||
nix-shell-writable-home = streamNixShellImage {
|
||||
name = "nix-shell-writable-home";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {};
|
||||
run = ''
|
||||
if [[ "$HOME" != "$(eval "echo ~$(whoami)")" ]]; then
|
||||
echo "\$HOME ($HOME) is not the same as ~\$(whoami) ($(eval "echo ~$(whoami)"))"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! touch $HOME/test-file; then
|
||||
echo "home directory is not writable"
|
||||
exit 1
|
||||
fi
|
||||
echo "home directory is writable"
|
||||
'';
|
||||
};
|
||||
|
||||
nix-shell-nonexistent-home = streamNixShellImage {
|
||||
name = "nix-shell-nonexistent-home";
|
||||
tag = "latest";
|
||||
drv = pkgs.mkShell {};
|
||||
homeDirectory = "/homeless-shelter";
|
||||
run = ''
|
||||
if [[ "$HOME" != "$(eval "echo ~$(whoami)")" ]]; then
|
||||
echo "\$HOME ($HOME) is not the same as ~\$(whoami) ($(eval "echo ~$(whoami)"))"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if -e $HOME; then
|
||||
echo "home directory exists"
|
||||
exit 1
|
||||
fi
|
||||
echo "home directory doesn't exist"
|
||||
'';
|
||||
};
|
||||
|
||||
nix-shell-build-derivation = streamNixShellImage {
|
||||
name = "nix-shell-build-derivation";
|
||||
tag = "latest";
|
||||
drv = pkgs.hello;
|
||||
run = ''
|
||||
buildDerivation
|
||||
$out/bin/hello
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
# Useful when packaging binaries that insist on using nss to look up
|
||||
# username/groups (like nginx).
|
||||
# /bin/sh is fine to not exist, and provided by another shim.
|
||||
{ symlinkJoin, writeTextDir, runCommand }:
|
||||
{ lib, symlinkJoin, writeTextDir, runCommand, extraPasswdLines ? [], extraGroupLines ? [] }:
|
||||
symlinkJoin {
|
||||
name = "fake-nss";
|
||||
paths = [
|
||||
(writeTextDir "etc/passwd" ''
|
||||
root:x:0:0:root user:/var/empty:/bin/sh
|
||||
nobody:x:65534:65534:nobody:/var/empty:/bin/sh
|
||||
${lib.concatStrings (map (line: line + "\n") extraPasswdLines)}nobody:x:65534:65534:nobody:/var/empty:/bin/sh
|
||||
'')
|
||||
(writeTextDir "etc/group" ''
|
||||
root:x:0:
|
||||
nobody:x:65534:
|
||||
${lib.concatStrings (map (line: line + "\n") extraGroupLines)}nobody:x:65534:
|
||||
'')
|
||||
(writeTextDir "etc/nsswitch.conf" ''
|
||||
hosts: files dns
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, python2, libkkc }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, python3, libkkc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libkkc-data";
|
||||
|
|
@ -9,7 +9,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python2.pkgs.marisa ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "build-python3.patch";
|
||||
url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
|
||||
relative = "data/templates/libkkc-data";
|
||||
hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.marisa ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "15.0";
|
||||
version = "16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GjBIAir4xTWnc1VXe5CF+FPcZJTSyJpi8MqlJUpkyy4=";
|
||||
sha256 = "sha256-kBXGYXOrza4tb5J9hmheDhZcwEd1xT6wLUc9cBGJ/AY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,9 +7,12 @@
|
|||
, intltool
|
||||
, libxmlxx
|
||||
, keybinder
|
||||
, keybinder3
|
||||
, gtk2
|
||||
, gtk3
|
||||
, libX11
|
||||
, libfm
|
||||
, libwnck
|
||||
, libwnck2
|
||||
, libXmu
|
||||
, libXpm
|
||||
|
|
@ -21,6 +24,7 @@
|
|||
, wirelesstools
|
||||
, curl
|
||||
, supportAlsa ? false, alsa-lib
|
||||
, withGtk3 ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -34,11 +38,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
|
||||
buildInputs = [
|
||||
keybinder
|
||||
gtk2
|
||||
(if withGtk3 then keybinder3 else keybinder)
|
||||
(if withGtk3 then gtk3 else gtk2)
|
||||
libX11
|
||||
libfm
|
||||
libwnck2
|
||||
(libfm.override { inherit withGtk3; })
|
||||
(if withGtk3 then libwnck else libwnck2)
|
||||
libXmu
|
||||
libXpm
|
||||
cairo
|
||||
|
|
@ -58,6 +62,8 @@ stdenv.mkDerivation rec {
|
|||
--replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
|
||||
'';
|
||||
|
||||
configureFlags = lib.optional withGtk3 "--enable-gtk3";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight X11 desktop panel for LXDE";
|
||||
homepage = "https://lxde.org/";
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.24.0";
|
||||
version = "0.25.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MywgFoydV58oBJ2dGK1lWSu7o3SkuOhLpKhy7WDAJ3I=";
|
||||
sha256 = "sha256-LLl3T7VvDyyeq47vgZPkQhcPk2yZMRsCta8EqduNvuY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-VcC7G0m/GYpxUZ+c+orFkCaqiNO3fUjymE29Z1pMqek=";
|
||||
cargoSha256 = "sha256-vMgU66LhhRrSA9Dx3eyVmUwrYKVtAfE12tQC8WzTimo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
|
|
|||
|
|
@ -161,17 +161,13 @@ let
|
|||
src = "${component}/${name}.cabal";
|
||||
};
|
||||
|
||||
# Adds a nix file as an input to the haskell derivation it
|
||||
# produces. This is useful for callHackage / callCabal2nix to
|
||||
# prevent the generated default.nix from being garbage collected
|
||||
# (requiring it to be frequently rebuilt), which can be an
|
||||
# annoyance.
|
||||
# Adds a nix file derived from cabal2nix in the passthru of the derivation it
|
||||
# produces. This is useful to debug callHackage / callCabal2nix by looking at
|
||||
# the content of the nix file pointed by `cabal2nixDeriver`.
|
||||
# However, it does not keep a reference to that file, which may be garbage
|
||||
# collected, which may be an annoyance.
|
||||
callPackageKeepDeriver = src: args:
|
||||
overrideCabal (orig: {
|
||||
preConfigure = ''
|
||||
# Generated from ${src}
|
||||
${orig.preConfigure or ""}
|
||||
'';
|
||||
passthru = orig.passthru or {} // {
|
||||
# When using callCabal2nix or callHackage, it is often useful
|
||||
# to debug a failure by inspecting the Nix expression
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, gfortran
|
||||
, texinfo
|
||||
, python2
|
||||
, python3
|
||||
, boost
|
||||
# Select SIMD alignment width (in bytes) for vectorization.
|
||||
, simdWidth ? 1
|
||||
|
|
@ -23,35 +25,37 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blitz++";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blitzpp";
|
||||
repo = "blitz";
|
||||
rev = "1.0.1";
|
||||
sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh";
|
||||
rev = version;
|
||||
hash = "sha256-wZDg+4lCd9iHvxuQQE/qs58NorkxZ0+mf+8PKQ57CDE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config python2 texinfo ];
|
||||
patches = [
|
||||
# https://github.com/blitzpp/blitz/pull/180
|
||||
(fetchpatch {
|
||||
name = "use-cmake-install-full-dir.patch";
|
||||
url = "https://github.com/blitzpp/blitz/commit/020f1d768c7fa3265cec244dc28f3dc8572719c5.patch";
|
||||
hash = "sha256-8hYFNyWrejjIWPN/HzIOphD4Aq6Soe0FFUBmwV4tpWQ=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
texinfo
|
||||
];
|
||||
|
||||
buildInputs = [ gfortran texinfo boost ];
|
||||
|
||||
configureFlags =
|
||||
[
|
||||
"--enable-shared"
|
||||
"--disable-static"
|
||||
"--enable-fortran"
|
||||
"--enable-optimize"
|
||||
"--with-pic=yes"
|
||||
"--enable-html-docs"
|
||||
"--disable-doxygen"
|
||||
"--disable-dot"
|
||||
"--disable-latex-docs"
|
||||
"--enable-simd-width=${toString simdWidth}"
|
||||
"--with-boost=${boost.dev}"
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
] ++ optional enablePadding "--enable-array-length-padding"
|
||||
++ optional enableSerialization "--enable-serialization"
|
||||
++ optional stdenv.is64bit "--enable-64bit";
|
||||
cmakeFlags = optional enablePadding "-DARRAY_LENGTH_PADDING=ON"
|
||||
++ optional enableSerialization "-DENABLE_SERIALISATION=ON"
|
||||
++ optional stdenv.is64bit "-DBZ_FULLY64BIT=ON";
|
||||
# FIXME ++ optional doCheck "-DBUILD_TESTING=ON";
|
||||
|
||||
# skip broken library name detection
|
||||
ax_boost_user_serialization_lib = lib.optionalString stdenv.isDarwin "boost_serialization";
|
||||
|
|
@ -59,12 +63,11 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
inherit doCheck;
|
||||
checkTarget = "check-testsuite check-examples";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast multi-dimensional array library for C++";
|
||||
homepage = "https://sourceforge.net/projects/blitz/";
|
||||
license = licenses.lgpl3;
|
||||
license = with licenses; [ artistic2 /* or */ bsd3 /* or */ lgpl3Plus ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ToxicFrog ];
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, libraw1394 }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, libraw1394, argp-standalone }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libavc1394";
|
||||
|
|
@ -9,9 +9,12 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0lsv46jdqvdx5hx92v0z2cz3yh6212pz9gk0k3513sbaa04zzcbw";
|
||||
};
|
||||
|
||||
buildInputs = lib.optional stdenv.hostPlatform.isMusl argp-standalone;
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [ libraw1394 ];
|
||||
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-largp";
|
||||
|
||||
meta = {
|
||||
description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
|
||||
homepage = "https://sourceforge.net/projects/libavc1394/";
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libsidplayfp";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsidplayfp";
|
||||
repo = "libsidplayfp";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-o9VPOX50QTp3gVNv2MEizrm4WxW6mOBi8eiuyoe2XZQ=";
|
||||
sha256 = "sha256-stfpyJC1AVmDh1Nk5c5Lv0j6ic2AU6mwY02L/IDr8tE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquid-dsp";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgaeddert";
|
||||
repo = "liquid-dsp";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mr86z37yycrqwbrmsiayi1vqrgpjq0pn1c3p1qrngipkw45jnn0";
|
||||
sha256 = "sha256-EvCxBwzpi3riSBhlHr6MmIUYKTCp02y5gz7pDJCEC1Q=";
|
||||
};
|
||||
|
||||
configureFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ];
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, buildPackages
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, removeReferencesTo
|
||||
, python3
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
, libjack2
|
||||
, libusb1
|
||||
, udev
|
||||
, libva
|
||||
, libsndfile
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
|
|
@ -33,7 +31,6 @@
|
|||
, nixosTests
|
||||
, withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind
|
||||
, valgrind
|
||||
, withMediaSession ? true
|
||||
, libcameraSupport ? true
|
||||
, libcamera
|
||||
, libdrm
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swiften";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
|
||||
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
|
||||
url = "http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2";
|
||||
hash = "sha256-aj+T6AevtR8birbsj+83nfzFC6cf72q+7nwSM0jaZrA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
sconsPackages.scons_3_1_2
|
||||
sconsPackages.scons_latest
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -65,6 +65,10 @@ stdenv.mkDerivation rec {
|
|||
postPatch = ''
|
||||
# Ensure bundled dependencies cannot be used.
|
||||
rm -rf 3rdParty
|
||||
|
||||
find . \( \
|
||||
-name '*.py' -o -name SConscript -o -name SConstruct \
|
||||
\) -exec 2to3 -w {} +
|
||||
'';
|
||||
|
||||
installTargets = "${placeholder "out"}";
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "the-foundation";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.skyjake.fi";
|
||||
owner = "skyjake";
|
||||
repo = "the_Foundation";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-IHwWJryG4HcrW9Bf8KJrisCrbF86RBQj6Xl1HTmcr6k=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-wPFBKc20/ED58RFpDhmPnlSHCf3FG5sD2ubQOl5NF+o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
@ -38,4 +38,4 @@ stdenv.mkDerivation rec {
|
|||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ let
|
|||
removeSuffix
|
||||
hasInfix
|
||||
optionalString
|
||||
makeBinPath
|
||||
makeLibraryPath
|
||||
makeSearchPath
|
||||
recurseIntoAttrs
|
||||
|
|
@ -249,6 +250,12 @@ let
|
|||
then pkgs.applyPatches { inherit (args) src patches; }
|
||||
else args.src;
|
||||
patches = [];
|
||||
|
||||
# make sure that propagated build-inputs from lispLibs are propagated
|
||||
propagatedBuildInputs = lib.unique
|
||||
(builtins.concatLists
|
||||
(lib.catAttrs "propagatedBuildInputs"
|
||||
(builtins.concatLists [[args] lispLibs nativeLibs javaLibs])));
|
||||
})));
|
||||
|
||||
# Build the set of lisp packages using `lisp`
|
||||
|
|
@ -353,7 +360,9 @@ let
|
|||
--prefix LD_LIBRARY_PATH : "${o.LD_LIBRARY_PATH}" \
|
||||
--prefix LD_LIBRARY_PATH : "${makeLibraryPath o.nativeLibs}" \
|
||||
--prefix CLASSPATH : "${o.CLASSPATH}" \
|
||||
--prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}"
|
||||
--prefix CLASSPATH : "${makeSearchPath "share/java/*" o.javaLibs}" \
|
||||
--prefix PATH : "${makeBinPath (o.buildInputs or [])}" \
|
||||
--prefix PATH : "${makeBinPath (o.propagatedBuildInputs or [])}"
|
||||
'';
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
From 2040fcab5a7be2f28add46a1412bef62ac5ccf11 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Marx <mmarx@wh2.tu-dresden.de>
|
||||
Date: Thu, 24 Nov 2022 20:00:33 +0100
|
||||
Subject: [PATCH] Use glucose binary from PATH if present
|
||||
|
||||
---
|
||||
src/package.lisp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/package.lisp b/src/package.lisp
|
||||
index b6e26ac..bdb2581 100644
|
||||
--- a/src/package.lisp
|
||||
+++ b/src/package.lisp
|
||||
@@ -13,7 +13,9 @@
|
||||
(defvar *glucose-home* (asdf:system-relative-pathname :cl-sat.glucose "glucose-syrup/"))
|
||||
|
||||
(defun glucose-binary (&optional (*glucose-home* *glucose-home*))
|
||||
- (merge-pathnames "simp/glucose_static" *glucose-home*))
|
||||
+ (if (trivial-package-manager:which "glucose")
|
||||
+ "glucose"
|
||||
+ (merge-pathnames "simp/glucose_static" *glucose-home*)))
|
||||
|
||||
(defmethod solve ((input pathname) (solver (eql :glucose)) &rest options &key debug &allow-other-keys)
|
||||
(remf options :debug)
|
||||
--
|
||||
2.36.2
|
||||
|
||||
|
|
@ -190,6 +190,17 @@ let
|
|||
nativeBuildInputs = [ pkgs.zeromq ];
|
||||
nativeLibs = [ pkgs.zeromq ];
|
||||
};
|
||||
trivial-package-manager = pkg: {
|
||||
propagatedBuildInputs = [ pkgs.which ];
|
||||
};
|
||||
"cl-sat.glucose" = pkg: {
|
||||
propagatedBuildInputs = [ pkgs.glucose ];
|
||||
patches = [ ./patches/cl-sat.glucose-binary-from-PATH-if-present.patch ];
|
||||
|
||||
};
|
||||
"cl-sat.minisat" = pkg: {
|
||||
propagatedBuildInputs = [ pkgs.minisat ];
|
||||
};
|
||||
};
|
||||
|
||||
qlpkgs =
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flit-core
|
||||
, matplotlib
|
||||
, numpy
|
||||
, pandas
|
||||
|
|
@ -20,6 +21,9 @@ buildPythonPackage rec {
|
|||
inherit pname version;
|
||||
sha256 = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI=";
|
||||
};
|
||||
format = "pyproject";
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
matplotlib
|
||||
|
|
@ -44,8 +48,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# All tests fail with TypeError
|
||||
"tests/test_aio.py"
|
||||
# ValueError: Unknown window type: "hanning"
|
||||
"tests/standards/test_iso_1996_2_2007.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "acoustics" ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioesphomeapi";
|
||||
version = "11.5.0";
|
||||
version = "12.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "esphome";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-z3ILdtxDU4xLBY5mVAKal2nBo2sdO5rlSQDyexwHUtI=";
|
||||
hash = "sha256-fcmxN5lnhvunxgQmz5AFNBJQAmC0sR/ChOa2rlp52Kk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -48,6 +48,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python Client for ESPHome native API";
|
||||
homepage = "https://github.com/esphome/aioesphomeapi";
|
||||
changelog = "https://github.com/esphome/aioesphomeapi/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab hexa ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, buildPythonPackage
|
||||
, openssl
|
||||
, pylsqpack
|
||||
|
|
@ -17,6 +18,19 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# This patch is here because it's required by the next patch.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch";
|
||||
hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag=";
|
||||
})
|
||||
# https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22
|
||||
(assert lib.versions.major pyopenssl.version == "22"; fetchpatch {
|
||||
url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch";
|
||||
hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
certifi
|
||||
pylsqpack
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-76IYH9IWeHU+PAtpLFGT5f8oG2roY3raW0NC3KUnFls=";
|
||||
hash = "sha256-FTDbQ9RZs1XleferFS8BAioWP0iWyHrDbytY68q/0tQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
|
@ -69,6 +69,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Annotation based documentation for your Ansible roles";
|
||||
homepage = "https://github.com/thegeeklab/ansible-doctor";
|
||||
changelog = "https://github.com/thegeeklab/ansible-doctor/releases/tag/v${version}";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ tboerger ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "appthreat-vulnerability-db";
|
||||
version = "3.0.2";
|
||||
version = "4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "AppThreat";
|
||||
repo = "vulnerability-db";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-y+ZOTvWnqSHBpuqquA0IvkWj1B/BmovTUqg1Oddjd5c=";
|
||||
sha256 = "sha256-tGvhbhldevMsa9091GDBq2vLRgMdOqc9kiEF8OZeUI8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder
|
||||
, clang_12, python2, python
|
||||
, clang_12, python
|
||||
, graphviz, matplotlib, numpy, pandas, plotly, scipy, six
|
||||
, withCuda ? false, cudatoolkit }:
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang_12 python2 ];
|
||||
nativeBuildInputs = [ clang_12 ];
|
||||
|
||||
propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ]
|
||||
++ lib.optionals withCuda [ cudatoolkit ];
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudscraper";
|
||||
version = "1.2.65";
|
||||
version = "1.2.66";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vwH5sSA9rFrnFO4zIvjloYXSNWK5Vn1rODO74vPWvEE=";
|
||||
hash = "sha256-XwzeI3dCcOigkt5o4PvWjheFTHZ/wtQEKpG9qeSBaHE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -36,6 +36,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module to bypass Cloudflare's anti-bot page";
|
||||
homepage = "https://github.com/venomous/cloudscraper";
|
||||
changelog = "https://github.com/VeNoMouS/cloudscraper/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kini ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "diff-cover";
|
||||
version = "7.0.2";
|
||||
version = "7.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "diff_cover";
|
||||
inherit version;
|
||||
hash = "sha256-OENUR9rTKrt+AdHDlCU5AhpSI4ijtYXVg6biB8wTNJc=";
|
||||
hash = "sha256-7RqhNSIUD3ofYoB7x1UoGdJDQ+6TmLenTpShjHji6GQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -61,6 +61,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Automatically find diff lines that need test coverage";
|
||||
homepage = "https://github.com/Bachmann1234/diff-cover";
|
||||
changelog = "https://github.com/Bachmann1234/diff_cover/releases/tag/v${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ dzabraev ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "discord.py";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "Rapptz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DX9AmVhwP7XgzUApY8d+UB6LGqymErsaSzaisuKAOB0=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-243w3J3nb/6GV5ogS/Ev9X3r0GrgUokMq14r5rjOdrA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -56,6 +56,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python wrapper for the Discord API";
|
||||
homepage = "https://discordpy.rtfd.org/";
|
||||
changelog = "https://github.com/Rapptz/discord.py/blob/v${version}/docs/whats_new.rst";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastapi-mail";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
owner = "sabuhish";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-58j3hb9selJTWitWQT8nkkhRJiPoFr0/mj5viSnnwlA=";
|
||||
hash = "sha256-+i/p4KVppsOkj2TEoZKmjrlnkhk2wxPg2enh2QCXiQI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcal-sync";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "allenporter";
|
||||
repo = "gcal_sync";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-KvWLaGTCIjHZpCiex2quIGsl+IZsM2aEARxGJbcR8lc=";
|
||||
hash = "sha256-FDxyuSR0Ekal/3+OhR3Z0pkiWYMToeCcfwBQp3bjnyw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gdown";
|
||||
version = "4.5.3";
|
||||
version = "4.5.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bL991BCFiMc0qliBMdjh1S5k8Ic4cPcfdMusGV8MYO8=";
|
||||
hash = "sha256-av9n0esi+zpa7StFY3lKo1Bsct8IP4ax7EkyUnCcpo8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A CLI tool for downloading large files from Google Drive";
|
||||
homepage = "https://github.com/wkentaro/gdown";
|
||||
changelog = "https://github.com/wkentaro/gdown/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ breakds ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -56,6 +56,10 @@ let
|
|||
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-7Ir55ZhBkccqfoa56WVBF8QwFAC2ws4KFHDkfVw6zm0=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_10_14_x86_64.whl";
|
||||
hash = "sha256-bOoQI+T+YsTUNA+cDu6wwYTcq9fyyzCpK9qrdCrNVoA=";
|
||||
};
|
||||
};
|
||||
|
||||
gpuSrc = fetchurl {
|
||||
|
|
@ -121,6 +125,6 @@ buildPythonPackage rec {
|
|||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ samuela ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-linux" ];
|
||||
platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
32
pkgs/development/python-modules/marisa/default.nix
Normal file
32
pkgs/development/python-modules/marisa/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, marisa
|
||||
, swig
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marisa";
|
||||
inherit (marisa) src version;
|
||||
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
buildInputs = [ marisa ];
|
||||
|
||||
preBuild = ''
|
||||
make -C bindings swig-python
|
||||
|
||||
cd bindings/python
|
||||
'';
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "marisa" ];
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for marisa";
|
||||
homepage = "https://github.com/s-yata/marisa-trie";
|
||||
license = with lib.licenses; [ bsd2 lgpl21Plus ];
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -20,12 +20,13 @@
|
|||
, tomli
|
||||
, types-setuptools
|
||||
, types-typed-ast
|
||||
, types-psutil
|
||||
, virtualenv
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy";
|
||||
version = "0.981";
|
||||
version = "0.991";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -33,13 +34,14 @@ buildPythonPackage rec {
|
|||
owner = "python";
|
||||
repo = "mypy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CkRK/j5DRUZU2enpZtqX4l+89E7ODDG9MeRYFQp9kSs=";
|
||||
hash = "sha256-ljnMlQUlz4oiZqlqOlqJOumrP6wKLDGiDtT3Y5OEQog=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
types-typed-ast
|
||||
types-setuptools
|
||||
types-psutil
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,15 +8,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygmars";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nexB";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wghk4nzplpl26iwrgvm0n9x88nyxlcxz4ywss4nwdr4hfccl28l";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
@ -36,6 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python lexing and parsing library";
|
||||
homepage = "https://github.com/nexB/pygmars";
|
||||
changelog = "https://github.com/nexB/pygmars/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyskyqremote";
|
||||
version = "0.3.20";
|
||||
version = "0.3.21";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "RogerSelwyn";
|
||||
repo = "skyq_remote";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-HLiLFuMJL9iXv7FckoVVK02jOhSRMrU8FohkD4gKjmM=";
|
||||
hash = "sha256-SVNvgQe4OonR6sVIMUeMYfs7fjL6JMnVEsQuw7VrJhQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -37,6 +37,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module for accessing SkyQ boxes";
|
||||
homepage = "https://github.com/RogerSelwyn/skyq_remote";
|
||||
changelog = "https://github.com/RogerSelwyn/skyq_remote/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "typeddjango";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM=";
|
||||
hash = "sha256-7Qow315zuZB6BNIIm6QR9ZMFH6E/VSp2vRBpONlqYhM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -50,9 +50,18 @@ buildPythonPackage rec {
|
|||
"pytest_mypy_plugins"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# ...TypecheckAssertionError: Invalid output:
|
||||
"with_out"
|
||||
"add_mypypath_env_var_to_package_searc"
|
||||
"error_case"
|
||||
"skip_if_false"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pytest plugin for testing mypy types, stubs, and plugins";
|
||||
homepage = "https://github.com/TypedDjango/pytest-mypy-plugins";
|
||||
changelog = "https://github.com/typeddjango/pytest-mypy-plugins/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ SomeoneSerge ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-mystrom";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "050dkx29wrmdd8z7pmyk36k2ihpapqi4qmyb70bm6xl5l4jh4k7j";
|
||||
sha256 = "sha256-Kqv5rUdwkynOzssID77gVYyzs0CDR/bUWh6zpt5zOP8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -39,6 +39,7 @@ buildPythonPackage rec {
|
|||
There is support for bulbs, motion sensors, plugs and buttons.
|
||||
'';
|
||||
homepage = "https://github.com/home-assistant-ecosystem/python-mystrom";
|
||||
changelog = "https://github.com/home-assistant-ecosystem/python-mystrom/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
sed -i '/--cov/d' pytest.ini
|
||||
sed -i '/--mypy/d' pytest.ini
|
||||
'';
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
|
|
@ -49,6 +50,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module with some convenient utilities";
|
||||
homepage = "https://github.com/WoLpH/python-utils";
|
||||
changelog = "https://github.com/wolph/python-utils/releases/tag/v${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.1.26";
|
||||
version = "1.1.27";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zuS19oM3V+o0yiby6yOX2RSxXY3m5qhqjlX2v9jmpIk=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CK5u2Nx1Z7XPDL5W24XxYCo3GfMYCAqKwxpQ8QTfQ0o=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -55,6 +55,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module to communicate with Skoda Connect";
|
||||
homepage = "https://github.com/lendy007/skodaconnect";
|
||||
changelog = "https://github.com/lendy007/skodaconnect/releases/tag/v${version}";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,29 +2,39 @@
|
|||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "svg2tikz";
|
||||
version = "1.0.0";
|
||||
disabled = ! isPy27;
|
||||
version = "unstable-2021-01-12";
|
||||
|
||||
propagatedBuildInputs = [ lxml ];
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kjellmf";
|
||||
owner = "xyz2tex";
|
||||
repo = "svg2tikz";
|
||||
rev = "ad36f2c3818da13c4136d70a0fd8153acf8daef4";
|
||||
sha256 = "sha256-QpQo7ENeU2crhc37uJu4rw/5+COPXQWXBynlF30lLV8=";
|
||||
fetchSubmodules = true;
|
||||
rev = "7a9959c295e1ed73e543474c6f3679d04cebc9e9";
|
||||
hash = "sha256-OLMFtEEdcY8ARI+hUSOhMwwcrtOAsbKRJRdDJcuaIBg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# upstream hasn't updated the tests in a while
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "svg2tikz" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kjellmf/svg2tikz";
|
||||
description = "An SVG to TikZ converter";
|
||||
homepage = "https://github.com/xyz2tex/svg2tikz";
|
||||
description = "Set of tools for converting SVG graphics to TikZ/PGF code";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ gal_bolle ];
|
||||
maintainers = with maintainers; [ dotlambda gal_bolle ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-colorama";
|
||||
version = "0.4.15.3";
|
||||
version = "0.4.15.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-k2L0kWdQX3EbvJpjUtrmZQSVswUzg4aPf3a/642SMAI=";
|
||||
hash = "sha256-YPfWJXkTE1IYVkzxudLpZ4wM5ywFHZ/6oadMdpBOWAg=";
|
||||
};
|
||||
|
||||
# Module has no tests
|
||||
|
|
|
|||
29
pkgs/development/python-modules/types-psutil/default.nix
Normal file
29
pkgs/development/python-modules/types-psutil/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-psutil";
|
||||
version = "5.9.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Tyb9sssGSydMvGNZ+6Sr87OimT19SrwzatCUdWghLGI=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"psutil-stubs"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Typing stubs for psutil";
|
||||
homepage = "https://github.com/python/typeshed";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ anselmschueler ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-setuptools";
|
||||
version = "65.5.0.3";
|
||||
version = "65.6.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-F3aRcfXyotxpslwNMQZVKlzadnu/azbLYhKyba5aqfw=";
|
||||
sha256 = "sha256-MnC+rbmbxvpLmlzDUQbnFEpcMwKM5ImSsQ50rcjMXII=";
|
||||
};
|
||||
|
||||
# Module doesn't have tests
|
||||
|
|
|
|||
|
|
@ -370,7 +370,7 @@ in
|
|||
# otherwise the gem will fail to link to the libv8 binary.
|
||||
# see: https://github.com/cowboyd/libv8/pull/161
|
||||
libv8 = attrs: {
|
||||
buildInputs = [ which v8 python2 ];
|
||||
buildInputs = [ which v8 python3 ];
|
||||
buildFlags = [ "--with-system-v8=true" ];
|
||||
dontBuild = false;
|
||||
# The gem includes broken symlinks which are ignored during unpacking, but
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "appthreat-depscan";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AppThreat";
|
||||
repo = "dep-scan";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-dOZ1EwTjOQzojvtL6sF1tTaOsi4dAHU3u/9HFD7VQy0=";
|
||||
hash = "sha256-JDc5VNcx/x1X4luPz9RBx4LII3402/CLim68l2QBkw4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, openjdk11, gradle, makeWrapper, maven }:
|
||||
{ lib, stdenv, fetchzip, openjdk, gradle, makeWrapper, maven }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kotlin-language-server";
|
||||
|
|
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ gradle makeWrapper ];
|
||||
buildInputs = [ openjdk11 gradle ];
|
||||
buildInputs = [ openjdk gradle ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk11} --prefix PATH : ${lib.strings.makeBinPath [ openjdk11 maven ] }
|
||||
wrapProgram "$out/bin/kotlin-language-server" --set JAVA_HOME ${openjdk} --prefix PATH : ${lib.strings.makeBinPath [ openjdk maven ] }
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||
using the Language Server Protocol Topics'';
|
||||
maintainers = with lib.maintainers; [ vtuan10 ];
|
||||
homepage = "https://github.com/fwcd/kotlin-language-server";
|
||||
changelog = "https://github.com/fwcd/kotlin-language-server/blob/${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
let ccache = stdenv.mkDerivation rec {
|
||||
pname = "ccache";
|
||||
version = "4.7.3";
|
||||
version = "4.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i5VOKBNAzu65Ha3Lj3Hh6k+EMGPRAo5/qnwnJipDnMI=";
|
||||
sha256 = "sha256-mt5udwSdzGaspfpAdUavQ55dBeJdhbZjcQpd9xNOQms=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
chmod -R u+w $out/share/nsis
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ sconsPackages.scons_3_1_2 ];
|
||||
nativeBuildInputs = [ sconsPackages.scons_latest ];
|
||||
buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
CPPPATH = symlinkJoin {
|
||||
|
|
@ -71,5 +71,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pombeirp ];
|
||||
mainProgram = "makensis";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,28 +4,28 @@ GEM
|
|||
ast (2.4.2)
|
||||
bugsnag (6.24.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
concurrent-ruby (1.1.9)
|
||||
concurrent-ruby (1.1.10)
|
||||
ffi (1.15.5)
|
||||
liquid (5.2.0)
|
||||
liquid (5.4.0)
|
||||
listen (3.7.1)
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
mini_portile2 (2.8.0)
|
||||
nokogiri (1.13.3)
|
||||
nokogiri (1.13.9)
|
||||
mini_portile2 (~> 2.8.0)
|
||||
racc (~> 1.4)
|
||||
parser (3.1.1.0)
|
||||
parser (3.1.2.1)
|
||||
ast (~> 2.4.1)
|
||||
racc (1.6.0)
|
||||
rb-fsevent (0.11.1)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
shopify-cli (2.14.0)
|
||||
shopify-cli (2.32.0)
|
||||
bugsnag (~> 6.22)
|
||||
listen (~> 3.7.0)
|
||||
theme-check (~> 1.10.1)
|
||||
theme-check (1.10.2)
|
||||
liquid (>= 5.1.0)
|
||||
theme-check (~> 1.11.0)
|
||||
theme-check (1.11.0)
|
||||
liquid (>= 5.4.0)
|
||||
nokogiri (>= 1.12)
|
||||
parser (~> 3)
|
||||
|
||||
|
|
@ -36,4 +36,4 @@ DEPENDENCIES
|
|||
shopify-cli
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.33
|
||||
2.3.25
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ let
|
|||
rubyEnv = bundlerEnv {
|
||||
name = "shopify-cli";
|
||||
gemdir = ./.;
|
||||
ruby = ruby;
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
|
||||
sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.9";
|
||||
version = "1.1.10";
|
||||
};
|
||||
ffi = {
|
||||
groups = ["default"];
|
||||
|
|
@ -45,10 +45,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "16aqzbvhvm254hbl274l4883h38j8wlwkcarmg09c7wzgpi0jnl1";
|
||||
sha256 = "0h0d0ghdf01lkv4x0mzp6zdkrnj7gsfq3widkhyni26bf6648qp3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.0";
|
||||
version = "5.4.0";
|
||||
};
|
||||
listen = {
|
||||
dependencies = ["rb-fsevent" "rb-inotify"];
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
|
||||
sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.3";
|
||||
version = "1.13.9";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
|
|
@ -88,10 +88,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
|
||||
sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.1.0";
|
||||
version = "3.1.2.1";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
|
|
@ -108,10 +108,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm";
|
||||
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
};
|
||||
rb-inotify = {
|
||||
dependencies = ["ffi"];
|
||||
|
|
@ -130,10 +130,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fjqahhvmvqvmpfwa337ran9hhn9wk0ylm502qvcy5i4xy5hvd2r";
|
||||
sha256 = "1zwq99zlsk624g5k706daapzhwm9v4whc8l6h3yw48265b6wkdwv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.14.0";
|
||||
version = "2.32.0";
|
||||
};
|
||||
theme-check = {
|
||||
dependencies = ["liquid" "nokogiri" "parser"];
|
||||
|
|
@ -141,9 +141,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0314f49fg354wgqavvipfaf6a03090kqrgv48qvkb0ikhvqawpdr";
|
||||
sha256 = "0971ma7qnbbycfnlwwq3pfz8f6axcslif9dbzmgimv7ad0nrjpp2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.2";
|
||||
version = "1.11.0";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,69 @@
|
|||
{ fetchurl, lib, stdenv, SDL, SDL_image, SDL_mixer, SDL_sound, libsigcxx, physfs
|
||||
, boost, expat, freetype, libjpeg, wxGTK32, lua, perl, pkg-config, zlib, zip, bzip2
|
||||
, libpng, libtiff, fluidsynth, libmikmod, libvorbis, flac, libogg }:
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, stdenv
|
||||
, SDL
|
||||
, SDL_image
|
||||
, SDL_mixer
|
||||
, SDL_sound
|
||||
, libsigcxx
|
||||
, physfs
|
||||
, boost
|
||||
, expat
|
||||
, freetype
|
||||
, libjpeg
|
||||
, wxGTK32
|
||||
, lua
|
||||
, perl
|
||||
, pkg-config
|
||||
, zlib
|
||||
, zip
|
||||
, bzip2
|
||||
, libpng
|
||||
, libtiff
|
||||
, fluidsynth
|
||||
, libmikmod
|
||||
, libvorbis
|
||||
, flac
|
||||
, libogg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asc";
|
||||
version = "2.6.0.0";
|
||||
version = "2.6.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/asc-hq/asc-${version}.tar.bz2";
|
||||
sha256 = "1fybasb6srqfg6pqbvh0s0vvzjq9r0n6aq0z44hs7n68kmaam775";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValHaris";
|
||||
repo = "asc-hq";
|
||||
rev = "fa3bca082a5cea2b35812349f99b877f0113aef0";
|
||||
sha256 = "atamYCN2mOqxV6auToTeWdpKuFfC+GLfLdRsfT0ouwQ=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-paragui" "--disable-paraguitest" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive -Wno-error=narrowing -std=c++11"; # I'm too lazy to catch all gcc47-related problems
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
SDL SDL_image SDL_mixer SDL_sound libsigcxx physfs boost expat
|
||||
freetype libjpeg wxGTK32 lua perl zlib zip bzip2 libpng
|
||||
libtiff fluidsynth libmikmod flac libvorbis libogg
|
||||
SDL
|
||||
SDL_image
|
||||
SDL_mixer
|
||||
SDL_sound
|
||||
physfs
|
||||
boost
|
||||
expat
|
||||
freetype
|
||||
libjpeg
|
||||
wxGTK32
|
||||
lua
|
||||
perl
|
||||
zlib
|
||||
zip
|
||||
bzip2
|
||||
libpng
|
||||
libtiff
|
||||
fluidsynth
|
||||
libmikmod
|
||||
flac
|
||||
libvorbis
|
||||
libogg
|
||||
libsigcxx
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzflag";
|
||||
version = "2.4.24";
|
||||
version = "2.4.26";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-X4Exvrf8i6UeMjoG7NfY6rkVN8NCzoehE+XrbqmM48Q=";
|
||||
sha256 = "sha256-AYMEBf8mrR3FlafgaVyCTCeG5niGjZ/4Iq6xSsdIEBQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ fetchFromGitHub, lib, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost,
|
||||
pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip,
|
||||
{ fetchFromGitHub, lib, stdenv, wxGTK30-gtk3, freeimage, cmake, zziplib, libGLU, libGL, boost,
|
||||
pkg-config, libuuid, openal, ogre, ois, curl, gtk3, mygui, unzip,
|
||||
angelscript, ogrepaged, mysocketw, libxcb
|
||||
}:
|
||||
|
||||
|
|
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0cb1il7qm45kfhh6h6jwfpxvjlh2dmg8z1yz9kj4d6098myf2lg4";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./gtk3.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
|
||||
mkdir -p $out/share/rigsofrods
|
||||
|
|
@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config unzip ];
|
||||
buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost
|
||||
libuuid openal ogre ois curl gtk2 mygui angelscript
|
||||
buildInputs = [ wxGTK30-gtk3 freeimage zziplib libGLU libGL boost
|
||||
libuuid openal ogre ois curl gtk3 mygui angelscript
|
||||
ogrepaged mysocketw libxcb ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -34,6 +38,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue