Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
796b7fd644
7
.github/workflows/backport.yml
vendored
7
.github/workflows/backport.yml
vendored
@ -1,10 +1,10 @@
|
||||
name: Backport
|
||||
on:
|
||||
pull_request:
|
||||
types: [closed]
|
||||
pull_request_target:
|
||||
types: [closed, labeled]
|
||||
jobs:
|
||||
backport:
|
||||
name: Create backport PRs
|
||||
name: Backport Pull Request
|
||||
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
@ -12,6 +12,7 @@ jobs:
|
||||
with:
|
||||
# required to find all branches
|
||||
fetch-depth: 0
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
- name: Create backport PRs
|
||||
# should be kept in sync with `version`
|
||||
uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd
|
||||
|
||||
@ -6621,6 +6621,16 @@
|
||||
githubId = 1387206;
|
||||
name = "Mike Sperber";
|
||||
};
|
||||
mikroskeem = {
|
||||
email = "mikroskeem@mikroskeem.eu";
|
||||
github = "mikroskeem";
|
||||
githubId = 3490861;
|
||||
name = "Mark Vainomaa";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xDA015B05B5A11B22";
|
||||
fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22";
|
||||
}];
|
||||
};
|
||||
milesbreslin = {
|
||||
email = "milesbreslin@gmail.com";
|
||||
github = "milesbreslin";
|
||||
|
||||
@ -305,6 +305,24 @@
|
||||
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>mediatomb</literal> service is
|
||||
now using by default the new and maintained fork
|
||||
<literal>gerbera</literal> package instead of the unmaintained
|
||||
<literal>mediatomb</literal> package. If you want to keep the old
|
||||
behavior, you must declare it with:
|
||||
<programlisting>
|
||||
services.mediatomb.package = pkgs.mediatomb;
|
||||
</programlisting>
|
||||
One new option <literal>openFirewall</literal> has been introduced which
|
||||
defaults to false. If you relied on the service declaration to add the
|
||||
firewall rules itself before, you should now declare it with:
|
||||
<programlisting>
|
||||
services.mediatomb.openFirewall = true;
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation.
|
||||
@ -844,6 +862,29 @@ environment.systemPackages = [
|
||||
All services should use <xref linkend="opt-systemd.services._name_.startLimitIntervalSec" /> or <literal>StartLimitIntervalSec</literal> in <xref linkend="opt-systemd.services._name_.unitConfig" /> instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>mediatomb</literal> service
|
||||
declares new options. It also adapts existing options so the
|
||||
configuration generation is now lazy. The existing option
|
||||
<literal>customCfg</literal> (defaults to false), when enabled, stops
|
||||
the service configuration generation completely. It then expects the
|
||||
users to provide their own correct configuration at the right location
|
||||
(whereas the configuration was generated and not used at all before).
|
||||
The new option <literal>transcodingOption</literal> (defaults to no)
|
||||
allows a generated configuration. It makes the mediatomb service pulls
|
||||
the necessary runtime dependencies in the nix store (whereas it was
|
||||
generated with hardcoded values before). The new option
|
||||
<literal>mediaDirectories</literal> allows the users to declare autoscan
|
||||
media directories from their nixos configuration:
|
||||
<programlisting>
|
||||
services.mediatomb.mediaDirectories = [
|
||||
{ path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; }
|
||||
{ path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; }
|
||||
];
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Unbound DNS resolver service (<literal>services.unbound</literal>) has been refactored to allow reloading, control sockets and to fix startup ordering issues.
|
||||
|
||||
@ -222,12 +222,7 @@ in
|
||||
debug = mkEnableOption "gnome-session debug messages";
|
||||
|
||||
flashback = {
|
||||
enableMetacity = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
example = "false";
|
||||
description = "Whether to enable the standard Metacity GNOME flashback session.";
|
||||
};
|
||||
enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
|
||||
|
||||
customSessions = mkOption {
|
||||
type = types.listOf (types.submodule {
|
||||
|
||||
@ -1,7 +1,17 @@
|
||||
{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
|
||||
, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, libcdio-paranoia
|
||||
, cdrdao
|
||||
, libsndfile
|
||||
, flac
|
||||
, sox
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
bins = [ libcdio-paranoia cdrdao flac sox util-linux ];
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "whipper";
|
||||
version = "0.10.0";
|
||||
|
||||
@ -12,44 +22,43 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
|
||||
};
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools_scm
|
||||
docutils
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
musicbrainzngs
|
||||
mutagen
|
||||
pycdio
|
||||
pygobject3
|
||||
requests
|
||||
ruamel_yaml
|
||||
setuptools
|
||||
setuptools_scm
|
||||
discid
|
||||
pillow
|
||||
];
|
||||
|
||||
buildInputs = [ libsndfile ];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
twisted
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
inherit cdparanoia;
|
||||
})
|
||||
];
|
||||
] ++ bins;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ])
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath bins)
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
|
||||
'';
|
||||
|
||||
# some tests require internet access
|
||||
# https://github.com/JoeLametta/whipper/issues/291
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# disable tests that require internet access
|
||||
# https://github.com/JoeLametta/whipper/issues/291
|
||||
substituteInPlace whipper/test/test_common_accurip.py \
|
||||
--replace "test_AccurateRipResponse" "dont_test_AccurateRipResponse"
|
||||
HOME=$TMPDIR ${python3.interpreter} -m unittest discover
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
--- a/whipper/program/cdparanoia.py
|
||||
+++ b/whipper/program/cdparanoia.py
|
||||
@@ -280,10 +280,10 @@
|
||||
|
||||
bufsize = 1024
|
||||
if self._overread:
|
||||
- argv = ["cd-paranoia", "--stderr-progress",
|
||||
+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
|
||||
"--sample-offset=%d" % self._offset, "--force-overread", ]
|
||||
else:
|
||||
- argv = ["cd-paranoia", "--stderr-progress",
|
||||
+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
|
||||
"--sample-offset=%d" % self._offset, ]
|
||||
if self._device:
|
||||
argv.extend(["--force-cdrom-device", self._device, ])
|
||||
@@ -560,7 +560,7 @@
|
||||
|
||||
def getCdParanoiaVersion():
|
||||
getter = common.VersionGetter('cd-paranoia',
|
||||
- ["cd-paranoia", "-V"],
|
||||
+ ["@cdparanoia@/bin/cdparanoia", "-V"],
|
||||
_VERSION_RE,
|
||||
"%(version)s %(release)s")
|
||||
|
||||
@@ -585,7 +585,7 @@
|
||||
def __init__(self, device=None):
|
||||
# cdparanoia -A *always* writes cdparanoia.log
|
||||
self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
|
||||
- self.command = ['cd-paranoia', '-A']
|
||||
+ self.command = ['@cdparanoia@/bin/cdparanoia', '-A']
|
||||
if device:
|
||||
self.command += ['-d', device]
|
||||
32
pkgs/applications/networking/cluster/dnsname-cni/default.nix
Normal file
32
pkgs/applications/networking/cluster/dnsname-cni/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib, dnsmasq }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cni-plugin-dnsname";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "dnsname";
|
||||
rev = "v${version}";
|
||||
sha256 = "090kpq2ppan9ayajdk5vwbvww30nphylgajn2p3441d4jg2nvsm3";
|
||||
};
|
||||
|
||||
patches = [ ./hardcode-dnsmasq-path.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace plugins/meta/dnsname/service.go --replace '@DNSMASQ@' '${dnsmasq}/bin/dnsmasq'
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
subPackages = [ "plugins/meta/dnsname" ];
|
||||
|
||||
doCheck = false; # NOTE: requires root privileges
|
||||
|
||||
meta = with lib; {
|
||||
description = "DNS name resolution for containers";
|
||||
homepage = "https://github.com/containers/dnsname";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mikroskeem ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go
|
||||
index fc05f75..f6b4caf 100644
|
||||
--- a/plugins/meta/dnsname/service.go
|
||||
+++ b/plugins/meta/dnsname/service.go
|
||||
@@ -16,10 +16,14 @@ import (
|
||||
|
||||
// newDNSMasqFile creates a new instance of a dnsNameFile
|
||||
func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) {
|
||||
+ /*
|
||||
dnsMasqBinary, err := exec.LookPath("dnsmasq")
|
||||
if err != nil {
|
||||
return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH")
|
||||
}
|
||||
+ */
|
||||
+ _ = errors.Errorf // XXX(mikroskeem): reduce diff
|
||||
+ dnsMasqBinary := "@DNSMASQ@"
|
||||
masqConf := dnsNameFile{
|
||||
ConfigFile: makePath(networkName, confFileName),
|
||||
Domain: domainName,
|
||||
@ -45,8 +45,7 @@ in mkYarnPackage rec {
|
||||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--set-default MOZ_DBUS_REMOTE 1
|
||||
--add-flags "$out/share/element/electron"
|
||||
'';
|
||||
|
||||
# Do not attempt generating a tarball for element-web again.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
|
||||
# requires invoking the Xcode build system, which is non-trivial for now.
|
||||
|
||||
{ stdenv, lib, fetchFromGitHub,
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch,
|
||||
# Main build tools
|
||||
pkg-config, autoconf, automake, libtool, m4, xz, python3,
|
||||
numactl,
|
||||
@ -58,6 +58,15 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
};
|
||||
|
||||
# Remove with a release after 1.3.3
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "audio-fix-ffmpeg-4_4";
|
||||
url = "https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch";
|
||||
sha256 = "sha256:1zcwa4h97d8wjspb8kbd8b1jg0a9vvmv9zaphzry4m9q0bj3h3kz";
|
||||
})
|
||||
];
|
||||
|
||||
# we put as little as possible in src.extraPostFetch as it's much easier to
|
||||
# add to it here without having to fiddle with src.sha256
|
||||
# only DATE and HASH are absolutely necessary
|
||||
|
||||
@ -10,7 +10,7 @@ rec {
|
||||
, containerdRev, containerdSha256
|
||||
, tiniRev, tiniSha256, buildxSupport ? false
|
||||
# package dependencies
|
||||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, stdenv, fetchFromGitHub, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute2, lvm2, systemd, docker-buildx
|
||||
@ -124,7 +124,7 @@ rec {
|
||||
}) // rec {
|
||||
inherit version rev;
|
||||
|
||||
name = "docker-${version}";
|
||||
pname = "docker";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
@ -163,8 +163,6 @@ rec {
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
|
||||
substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
|
||||
substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man
|
||||
'' + optionalString buildxSupport ''
|
||||
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
|
||||
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
|
||||
@ -222,19 +220,19 @@ rec {
|
||||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.2";
|
||||
version = "20.10.6";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51";
|
||||
sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl";
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = "v${version}";
|
||||
sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w";
|
||||
sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk";
|
||||
};
|
||||
runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92
|
||||
runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94";
|
||||
containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3
|
||||
containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
|
||||
runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95
|
||||
runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb";
|
||||
containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1
|
||||
containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d";
|
||||
tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
|
||||
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
|
||||
};
|
||||
|
||||
32
pkgs/applications/virtualization/imgcrypt/default.nix
Normal file
32
pkgs/applications/virtualization/imgcrypt/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "imgcrypt";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k";
|
||||
};
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags=-X github.com/containerd/containerd/version.Version=${version}"
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ];
|
||||
|
||||
postFixup = ''
|
||||
mv $out/bin/ctr $out/bin/ctr-enc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image encryption library and command line tool";
|
||||
homepage = "https://github.com/containerd/imgcrypt";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mikroskeem ];
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-freon";
|
||||
version = "40";
|
||||
version = "44";
|
||||
|
||||
uuid = "freon@UshakovVasilii_Github.yahoo.com";
|
||||
|
||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "UshakovVasilii";
|
||||
repo = "gnome-shell-extension-freon";
|
||||
rev = "EGO-${version}";
|
||||
sha256 = "0ak6f5dds9kk3kqww681gs3l1mj3vf22icrvb5m257s299rq8yzl";
|
||||
sha256 = "sha256-4DYAIC9N5id3vQe0WaOFP+MymsrPK18hbYqO4DjG+2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
||||
19
pkgs/development/python-modules/cock/default.nix
Normal file
19
pkgs/development/python-modules/cock/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook, click, sortedcontainers, pyyaml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cock";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1gwaklvwlyvhz2c07hdmhbnqqmpybssxzzr0399dpjk7dgdqgam3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click sortedcontainers pyyaml ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pohmelie/cock";
|
||||
description = "Configuration file with click";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-python-client";
|
||||
version = "2.0.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28";
|
||||
sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va";
|
||||
};
|
||||
|
||||
# No tests included in archive
|
||||
|
||||
@ -3,12 +3,12 @@ GEM
|
||||
specs:
|
||||
parallel (1.20.1)
|
||||
pg (1.2.3)
|
||||
pgsync (0.6.6)
|
||||
pgsync (0.6.7)
|
||||
parallel
|
||||
pg (>= 0.18.2)
|
||||
slop (>= 4.8.2)
|
||||
tty-spinner
|
||||
slop (4.8.2)
|
||||
slop (4.9.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
|
||||
@ -25,20 +25,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr";
|
||||
sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
};
|
||||
slop = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3";
|
||||
sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.8.2";
|
||||
version = "4.9.0";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -1,32 +1,38 @@
|
||||
{
|
||||
"4.14": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.14.232-hardened1.patch",
|
||||
"sha256": "141bjr8z5gg5c9bwbq2krhpwzhs225g5465izgz38sls57dllll4",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.232-hardened1/linux-hardened-4.14.232-hardened1.patch"
|
||||
"name": "linux-hardened-4.14.234-hardened1.patch",
|
||||
"sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch"
|
||||
},
|
||||
"4.19": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-4.19.190-hardened1.patch",
|
||||
"sha256": "111pxnnmajd1c7p51v99qc28dq7hrhji6ja0i5m46d2r8am1z4cz",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.190-hardened1/linux-hardened-4.19.190-hardened1.patch"
|
||||
"name": "linux-hardened-4.19.192-hardened1.patch",
|
||||
"sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch"
|
||||
},
|
||||
"5.10": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.10.37-hardened1.patch",
|
||||
"sha256": "16bmvb6w55bdcd3nfz1ixwp081gcyx0hq885i0ixjnjz7n5q80wq",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.37-hardened1/linux-hardened-5.10.37-hardened1.patch"
|
||||
"name": "linux-hardened-5.10.40-hardened1.patch",
|
||||
"sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch"
|
||||
},
|
||||
"5.11": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.11.21-hardened1.patch",
|
||||
"sha256": "087zg8mphpbzcac9xi9qqfzl7ccd3qb93jif2gqjvsm3q2pk2m3g",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.21-hardened1/linux-hardened-5.11.21-hardened1.patch"
|
||||
"name": "linux-hardened-5.11.22-hardened1.patch",
|
||||
"sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch"
|
||||
},
|
||||
"5.12": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.12.7-hardened1.patch",
|
||||
"sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch"
|
||||
},
|
||||
"5.4": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.4.119-hardened1.patch",
|
||||
"sha256": "1qbw8287jv96fqar5wi52yh1g6v9nnr53y2vpr3777sadcr19mm9",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.119-hardened1/linux-hardened-5.4.119-hardened1.patch"
|
||||
"name": "linux-hardened-5.4.122-hardened1.patch",
|
||||
"sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.14.232";
|
||||
version = "4.14.234";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0sa3sz7bznlhijd0iwv37nyrrnw34iq6dq1bqr6cj2wpyrhr7h8x";
|
||||
sha256 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.19.190";
|
||||
version = "4.19.192";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0pf8py0id0r8wzr5050bik1sbhl8gsznnr5bvcmrs4jkhpp2m73g";
|
||||
sha256 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.4.268";
|
||||
version = "4.4.270";
|
||||
extraMeta.branch = "4.4";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "1srk08kaxq5jjlqx804cgjffhcsrdkv3idh8ipagl6v2w4kas5v8";
|
||||
sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "4.9.268";
|
||||
version = "4.9.270";
|
||||
extraMeta.branch = "4.9";
|
||||
extraMeta.broken = stdenv.isAarch64;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "0aknrlf5q0dsqib8c9klmf5c60dy7hg2zksb020qvyrp077gcrjv";
|
||||
sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.37";
|
||||
version = "5.10.40";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0xz01g017s9kcc9awlg6p9wrm8pzxyk4fizrf3mq9i5gklqf7md8";
|
||||
sha256 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.11.21";
|
||||
version = "5.11.22";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0zw7mpq6lfbw2ycv4lvkya93h1h18gvc8c66m82bca5y02xsasrn";
|
||||
sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.12.4";
|
||||
version = "5.12.7";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0wv89gwf5v8m7wi2f3bv9mdr8n9raq998sy4m1m2lwwjhkpgwq2s";
|
||||
sha256 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ];
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.4.119";
|
||||
version = "5.4.122";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||
@ -13,7 +13,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "185jxk0cfnk8c6rfc78id2qwd9k2597xyc4dv2pahjc13v7xxrvi";
|
||||
sha256 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p";
|
||||
};
|
||||
|
||||
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ];
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, lib, fetchsvn, linux
|
||||
, scripts ? fetchsvn {
|
||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||
rev = "18063";
|
||||
sha256 = "1mmijqra6sq2pcc8yhh8m4k6x0dvhnq4xxzm1qs7kdznj2zwr8is";
|
||||
rev = "18096";
|
||||
sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg";
|
||||
}
|
||||
, ...
|
||||
}:
|
||||
|
||||
@ -2,24 +2,24 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gmnisrv";
|
||||
version = "unstable-2021-03-26";
|
||||
version = "unstable-2021-05-16";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~sircmpwn";
|
||||
repo = "gmnisrv";
|
||||
rev = "f23ec10a6d66c574bbf718c4b10f2cf91ea8daef";
|
||||
sha256 = "1d9rjx0s092yfzjxd2yvzixhqgg883nlnmsysgp21w75n2as354n";
|
||||
rev = "b9a92193e96bbe621ebc8430d8308d45a5b86cef";
|
||||
sha256 = "sha256-eMKsoq3Y+eS20nxI7EoDLbdwdoB6shbGt6p8wS+uoPc=";
|
||||
};
|
||||
|
||||
MIMEDB = "${mime-types}/etc/mime.types";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl mime-types scdoc ];
|
||||
nativeBuildInputs = [ pkg-config scdoc ];
|
||||
buildInputs = [ openssl mime-types ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple Gemini protocol server";
|
||||
homepage = "https://git.sr.ht/~sircmpwn/gmnisrv";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ bsima jb55 ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs=";
|
||||
};
|
||||
|
||||
hardeningEnable = [ "pie" ];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config perl ];
|
||||
buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ]
|
||||
++ lib.optional withHyperscan hyperscan
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchgit
|
||||
, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg_3, file
|
||||
, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file
|
||||
, pkg-config, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg_3 file mp4v2 flac
|
||||
buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac
|
||||
pkg-config autoreconfHook ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wordpress";
|
||||
version = "5.7.1";
|
||||
version = "5.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://wordpress.org/${pname}-${version}.tar.gz";
|
||||
sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4";
|
||||
sha256 = "sha256-640FIIFZRp0L48szn3tqFQo59QP69nnCVQKEM/UTEhk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.29.0";
|
||||
version = "1.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yTsmgRs3H5do1lG28RU/OY5QJFcwvkrsV/HGuVzD+3M=";
|
||||
sha256 = "sha256-7KuQC9L9Tp4s0E2iOlhgmezzjys1UhpHEe0gaYcy8oM=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
||||
43
pkgs/tools/audio/patray/default.nix
Normal file
43
pkgs/tools/audio/patray/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, python3
|
||||
, qt5
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "patray";
|
||||
version = "0.1.1";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "0vaapn2p4257m1d5nbnwnh252b7lhl00560gr9pqh2b7xqm1bh6g";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i '30i entry_points = { "console_scripts": [ "patray = patray.__main__:main" ] },' setup.py
|
||||
sed -i 's/production.txt/production.in/' setup.py
|
||||
sed -i '/pyside2/d' requirements/production.in
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
pulsectl
|
||||
loguru
|
||||
cock
|
||||
pyside2
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
postFixup = ''
|
||||
wrapQtApp $out/bin/patray
|
||||
'';
|
||||
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yet another tray pulseaudio frontend";
|
||||
homepage = "https://github.com/pohmelie/patray";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
@ -1,46 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper, zfs
|
||||
, perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sanoid";
|
||||
version = "2.0.3";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimsalterjrs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1wmymzqg503nmhw8hrblfs67is1l3ljbk2fjvrqwyb01b7mbn80x";
|
||||
sha256 = "12g5cjx34ys6ix6ivahsbr3bbbi1fmjwdfdk382z6q71w3pyxxzf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Make sanoid look for programs in PATH
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jimsalterjrs/sanoid/commit/dc2371775afe08af799d3097d47b48182d1716eb.patch";
|
||||
sha256 = "16hlwcbcb8h3ar1ywd2bzr3h3whgbcfk6walmp8z6j74wbx81aav";
|
||||
})
|
||||
# Make findoid look for programs in PATH
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jimsalterjrs/sanoid/commit/44bcd21f269e17765acd1ad0d45161902a205c7b.patch";
|
||||
sha256 = "0zqyl8q5sfscqcc07acw68ysnlnh3nb57cigjfwbccsm0zwlwham";
|
||||
})
|
||||
# Add --cache-dir option
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jimsalterjrs/sanoid/commit/a1f5e4c0c006e16a5047a16fc65c9b3663adb81e.patch";
|
||||
sha256 = "1bb4g2zxrbvf7fvcgzzxsr1cvxzrxg5dzh89sx3h7qlrd6grqhdy";
|
||||
})
|
||||
# Add --run-dir option
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jimsalterjrs/sanoid/commit/59a07f92b4920952cc9137b03c1533656f48b121.patch";
|
||||
sha256 = "11v4jhc36v839gppzvhvzp5jd22904k8xqdhhpx6ghl75yyh4f4s";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = with perlPackages; [ perl ConfigIniFiles CaptureTiny ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
mkdir -p "$out/etc/sanoid"
|
||||
cp sanoid.defaults.conf "$out/etc/sanoid/sanoid.defaults.conf"
|
||||
@ -63,12 +42,14 @@ stdenv.mkDerivation rec {
|
||||
wrapProgram "$out/bin/findoid" \
|
||||
--prefix PERL5LIB : "$PERL5LIB" \
|
||||
--prefix PATH : "${makeBinPath [ "/run/booted-system/sw" zfs ]}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A policy-driven snapshot management tool for ZFS filesystems";
|
||||
homepage = "https://github.com/jimsalterjrs/sanoid";
|
||||
license = licenses.gpl3;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lopsided98 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
|
||||
@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
version = "unstable-2021-03-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lptstr";
|
||||
owner = "kiedtl";
|
||||
repo = pname;
|
||||
rev = "882781a297e86f4ad4eaf143e0777fb3e7c69526";
|
||||
sha256 = "sha256-ONrVZC6GBV5v3TeBekW9ybZjDHF3FNyXw1rYknqKRbk=";
|
||||
@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
buildInputs = [ bash scdoc ];
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
|
||||
installFlags = [ "PREFIX=$(out)/" ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs --host src/*
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "piston-cli";
|
||||
version = "1.3.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "XzKXHZHYZRT3t4ZonM+Ngx1jIT1nmz4k34VSw29GFoM=";
|
||||
sha256 = "o8GPtSQ119AKB64hAH8VY6iJmhXcSFqjOanmXQl0tHo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments ];
|
||||
propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ];
|
||||
|
||||
checkPhase = ''
|
||||
$out/bin/piston --help > /dev/null
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c79n/gNMAg+Eb+ZJcG+H+GSB0hI9FyyqkZGDcfz0ahA=";
|
||||
sha256 = "sha256-OgpSVyXvJeRpxHWfIoJjQbbkt2RSze0IL5za3igGE6s=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-m7hYDnZBBcrSHL2s+NwD/Z9+gpFvfZmnoLwgOXqc3mw=";
|
||||
cargoSha256 = "sha256-LgJPhwOuzlKIw5smy4WJvC0CFoylnMlx6Re7gVPtiq8=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
postPatch = ''
|
||||
sed -i tq \
|
||||
-e 's|\bfq\b|'$out'/bin/fq|g' \
|
||||
-e 's|\bnq\b|'$out'/bin/nq|g'
|
||||
-e 's|\bnq\b|'$out'/bin/nq|g' \
|
||||
-e 's|\bfq\b|'$out'/bin/fq|g'
|
||||
'';
|
||||
meta = with lib; {
|
||||
description = "Unix command line queue utility";
|
||||
|
||||
@ -1571,6 +1571,8 @@ in
|
||||
|
||||
imgpatchtools = callPackage ../development/mobile/imgpatchtools { };
|
||||
|
||||
imgcrypt = callPackage ../applications/virtualization/imgcrypt { };
|
||||
|
||||
ipgrep = callPackage ../tools/networking/ipgrep { };
|
||||
|
||||
lastpass-cli = callPackage ../tools/security/lastpass-cli { };
|
||||
@ -7157,6 +7159,8 @@ in
|
||||
|
||||
pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { };
|
||||
|
||||
patray = callPackage ../tools/audio/patray { };
|
||||
|
||||
pasystray = callPackage ../tools/audio/pasystray { };
|
||||
|
||||
pcmsolver = callPackage ../development/libraries/pcmsolver { };
|
||||
@ -22893,6 +22897,8 @@ in
|
||||
cni = callPackage ../applications/networking/cluster/cni {};
|
||||
cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
|
||||
|
||||
dnsname-cni = callPackage ../applications/networking/cluster/dnsname-cni {};
|
||||
|
||||
multus-cni = callPackage ../applications/networking/cluster/multus-cni {};
|
||||
|
||||
cntr = callPackage ../applications/virtualization/cntr { };
|
||||
@ -25897,7 +25903,7 @@ in
|
||||
|
||||
pistol = callPackage ../tools/misc/pistol { };
|
||||
|
||||
piston-cli = callPackage ../tools/misc/piston-cli { };
|
||||
piston-cli = callPackage ../tools/misc/piston-cli { python3Packages = python39Packages; };
|
||||
|
||||
plater = libsForQt5.callPackage ../applications/misc/plater { };
|
||||
|
||||
|
||||
@ -1397,6 +1397,8 @@ in {
|
||||
|
||||
clf = callPackage ../development/python-modules/clf { };
|
||||
|
||||
cock = callPackage ../development/python-modules/cock { };
|
||||
|
||||
click = callPackage ../development/python-modules/click { };
|
||||
|
||||
clickclick = callPackage ../development/python-modules/clickclick { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user