mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
ba990541d1
2
.github/workflows/backport.yml
vendored
2
.github/workflows/backport.yml
vendored
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
with:
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
- name: Create backport PRs
|
||||
uses: zeebe-io/backport-action@v0.0.6
|
||||
uses: zeebe-io/backport-action@v0.0.7
|
||||
with:
|
||||
# Config README: https://github.com/zeebe-io/backport-action#backport-action
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
|
|||
|
|
@ -584,6 +584,7 @@
|
|||
./services/misc/safeeyes.nix
|
||||
./services/misc/sdrplay.nix
|
||||
./services/misc/sickbeard.nix
|
||||
./services/misc/signald.nix
|
||||
./services/misc/siproxd.nix
|
||||
./services/misc/snapper.nix
|
||||
./services/misc/sonarr.nix
|
||||
|
|
|
|||
105
nixos/modules/services/misc/signald.nix
Normal file
105
nixos/modules/services/misc/signald.nix
Normal file
|
|
@ -0,0 +1,105 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.signald;
|
||||
dataDir = "/var/lib/signald";
|
||||
defaultUser = "signald";
|
||||
in
|
||||
{
|
||||
options.services.signald = {
|
||||
enable = mkEnableOption "the signald service";
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = defaultUser;
|
||||
description = "User under which signald runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = defaultUser;
|
||||
description = "Group under which signald runs.";
|
||||
};
|
||||
|
||||
socketPath = mkOption {
|
||||
type = types.str;
|
||||
default = "/run/signald/signald.sock";
|
||||
description = "Path to the signald socket";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users = optionalAttrs (cfg.user == defaultUser) {
|
||||
${defaultUser} = {
|
||||
group = cfg.group;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = optionalAttrs (cfg.group == defaultUser) {
|
||||
${defaultUser} = { };
|
||||
};
|
||||
|
||||
systemd.services.signald = {
|
||||
description = "A daemon for interacting with the Signal Private Messenger";
|
||||
wants = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ExecStart = "${pkgs.signald}/bin/signald -d ${dataDir} -s ${cfg.socketPath}";
|
||||
Restart = "on-failure";
|
||||
StateDirectory = "signald";
|
||||
RuntimeDirectory = "signald";
|
||||
StateDirectoryMode = "0750";
|
||||
RuntimeDirectoryMode = "0750";
|
||||
|
||||
BindReadOnlyPaths = [
|
||||
"/nix/store"
|
||||
"-/etc/resolv.conf"
|
||||
"-/etc/nsswitch.conf"
|
||||
"-/etc/hosts"
|
||||
"-/etc/localtime"
|
||||
];
|
||||
CapabilityBoundingSet = "";
|
||||
# ProtectClock= adds DeviceAllow=char-rtc r
|
||||
DeviceAllow = "";
|
||||
# Use a static user so other applications can access the files
|
||||
#DynamicUser = true;
|
||||
LockPersonality = true;
|
||||
# Needed for java
|
||||
#MemoryDenyWriteExecute = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
# Needs network access
|
||||
#PrivateNetwork = true;
|
||||
PrivateTmp = true;
|
||||
PrivateUsers = true;
|
||||
ProcSubset = "pid";
|
||||
ProtectClock = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
# Would re-mount paths ignored by temporary root
|
||||
#ProtectSystem = "strict";
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [ "@system-service" "~@privileged @resources @setuid @keyring" ];
|
||||
TemporaryFileSystem = "/:ro";
|
||||
# Does not work well with the temporary root
|
||||
#UMask = "0066";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "95.0.4638.54",
|
||||
"sha256": "1zb1009gg9962axn2l1krycz7ml20i8z2n3ka2psxpg68pbqivry",
|
||||
"sha256bin64": "0mf9jfzwz6nkz1yg8lndz1gmsvmdh1rxhqkv0vd9nr04h5x9b41a",
|
||||
"version": "95.0.4638.69",
|
||||
"sha256": "1rzg48mbd5n75nq2rfwknyxpmfrddds199ic82c736kcgirpv8rq",
|
||||
"sha256bin64": "1jhxm12sdlgvgnny0p56xsfyxd78mwn9qwc20c33qfvwxrzp9ajp",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
|
|
@ -12,15 +12,15 @@
|
|||
}
|
||||
},
|
||||
"chromedriver": {
|
||||
"version": "95.0.4638.17",
|
||||
"sha256_linux": "0jqq2h3rjancq9gk4w29gcr4b3z4irnkbvcj97fdsnksck9y5h2q",
|
||||
"sha256_darwin": "0vl73i28xq3z5njg4287j08pb2sfd28amc8hkm4ddq5dgqpim0l8"
|
||||
"version": "95.0.4638.54",
|
||||
"sha256_linux": "0p228x7w423p3zqwfdba2jj4x4gkxz4267qzzswpba335p3k1nyk",
|
||||
"sha256_darwin": "1yxi8c18fa07w8kdm63v4663lhgx1y56957bkqb7hf459bzz594l"
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "96.0.4664.18",
|
||||
"sha256": "0z7hplfl9mlbn07svcavzcb2gqn1hchwhhlpz0qykf6kd441kxpf",
|
||||
"sha256bin64": "0pm8za2vkl30fn2nclg7cfq2ywn5irbzqb3blawybf3cv4ws8nbi",
|
||||
"version": "96.0.4664.27",
|
||||
"sha256": "1ym9llqmkhlnrmawc0dcnzkvr714kykvdcldkar5yqp0x46k7bi6",
|
||||
"sha256bin64": "1x4y589qmiz0zgkpv17phcl8h5c7qankpfvv6c42w5bysx6mn1f7",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-09-24",
|
||||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "97.0.4676.0",
|
||||
"sha256": "1cf660h7n1d4ds63747zfc4wmwxm348grcv40zg614cpjm4q68b5",
|
||||
"sha256bin64": "116a4d47s3sx1pq8hhqybdsjxcv8657xaldrlix2z7jh94ip2nwh",
|
||||
"version": "97.0.4682.3",
|
||||
"sha256": "1z2d3r3d4g3ng1p73s243jllvvfkh085vvqz0vaa6pv7c9631pn4",
|
||||
"sha256bin64": "0xravg4jjbwj7vifabz94mfammv0zx754hpa6kynjaqzvlxbax2a",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-10-08",
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ let
|
|||
});
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "signal-desktop";
|
||||
version = "5.21.0"; # Please backport all updates to the stable channel.
|
||||
version = "5.22.0"; # Please backport all updates to the stable channel.
|
||||
# All releases have a limited lifetime and "expire" 90 days after the release.
|
||||
# When releases "expire" the application becomes unusable until an update is
|
||||
# applied. The expiration date for the current release can be extracted with:
|
||||
|
|
@ -68,7 +68,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "19bp5gjf13n87cyicqaikmz3bdx6szazq1kbp4gkyhq0mw7nah7c";
|
||||
sha256 = "1y88qw57wk187fjb05zqvagv4pamc8171xwvznqb2k0vclsg82j8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,17 +1,15 @@
|
|||
{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl
|
||||
{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl
|
||||
, makeWrapper }:
|
||||
|
||||
let
|
||||
pname = "signald";
|
||||
version = "0.14.1";
|
||||
|
||||
version = "0.13.1";
|
||||
|
||||
# This package uses the .git directory
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.com/signald/signald";
|
||||
src = fetchFromGitLab {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7";
|
||||
leaveDotGit = true;
|
||||
sha256 = "K/G5+w1GINLZwJIG5a7u0TxlGe+Cyp4wQm+pgm28qCA=";
|
||||
};
|
||||
|
||||
buildConfigJar = fetchurl {
|
||||
|
|
@ -19,8 +17,6 @@ let
|
|||
sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f";
|
||||
};
|
||||
|
||||
patches = [ ./git-describe-always.patch ./gradle-plugin.patch ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs gradlew
|
||||
sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle
|
||||
|
|
@ -29,7 +25,7 @@ let
|
|||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
name = "${pname}-deps";
|
||||
inherit src version postPatch patches;
|
||||
inherit src version postPatch;
|
||||
nativeBuildInputs = [ gradle_6 perl ];
|
||||
buildPhase = ''
|
||||
export GRADLE_USER_HOME=$(mktemp -d)
|
||||
|
|
@ -45,11 +41,17 @@ let
|
|||
forceShare = [ "dummy" ];
|
||||
outputHashAlgo = "sha256";
|
||||
outputHashMode = "recursive";
|
||||
outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7";
|
||||
# Downloaded jars differ by platform
|
||||
outputHash = {
|
||||
x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM=";
|
||||
aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A=";
|
||||
}.${stdenv.system} or (throw "Unsupported platform");
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit pname src version postPatch patches;
|
||||
inherit pname src version postPatch;
|
||||
|
||||
patches = [ ./gradle-plugin.patch ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
|
@ -90,6 +92,6 @@ in stdenv.mkDerivation rec {
|
|||
homepage = "https://signald.org";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ expipiplus1 ];
|
||||
platforms = platforms.unix;
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
diff --git a/version.sh b/version.sh
|
||||
index 7aeeb3c..060cba3 100755
|
||||
--- a/version.sh
|
||||
+++ b/version.sh
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/sh
|
||||
-VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count)
|
||||
+VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count)
|
||||
echo $VERSION
|
||||
|
|
@ -2,7 +2,7 @@ diff --git a/build.gradle b/build.gradle
|
|||
index 11d7a99..66805bb 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
||||
@@ -18,9 +18,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal
|
||||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||
import org.xml.sax.SAXParseException
|
||||
|
||||
|
|
@ -17,10 +17,3 @@ index 11d7a99..66805bb 100644
|
|||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'application'
|
||||
@@ -185,4 +188,4 @@ task integrationTest(type: Test) {
|
||||
testClassesDirs = sourceSets.integrationTest.output.classesDirs
|
||||
classpath = sourceSets.integrationTest.runtimeClasspath
|
||||
outputs.upToDateWhen { false }
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-ews";
|
||||
version = "3.42.0";
|
||||
version = "3.42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "1byi1ksimbycd0daxp5j240r3n5qlaa4b3c5l9jzkjr9g3gkclsq";
|
||||
sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gettext intltool pkg-config ];
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution";
|
||||
version = "3.42.0";
|
||||
version = "3.42.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "0yj2hifis5m2cy59skn07d8n69444vlsw62ildr1fv67zxbblib8";
|
||||
sha256 = "RlMq46E6aIV3GtEiNLlBQRZ67HRyOn7tE9293a767kU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "youtube";
|
||||
namespace = "plugin.video.youtube";
|
||||
version = "6.8.17+matrix.1";
|
||||
version = "6.8.18+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "AuYoUyv0DDtHnxFiNl3AF5jrMjuNRXdlJvw7d7b+yh8=";
|
||||
sha256 = "F950rnE/YxwWI0ieHC2TdGNSfrQDHlStnxLbA6UjEaM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-connections";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-M5/1VaEI0gt6sPO/GCmWMWAYYOeO+peLpqudGO3DtGA=";
|
||||
hash = "sha256-ia9eWM2D6mLl+abwMadKOFUIW6KS8OqFgGQIs6+DTug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "evolution-data-server";
|
||||
version = "3.42.0";
|
||||
version = "3.42.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "6P3TvEegfW+KMFK7yuiA8g9tvE9pc6jpDQAWm7mbFjU=";
|
||||
sha256 = "5uZ/KnfQ/z5tpQsD3F+iZucWYmvNou9EFE4xfjXy9Sg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-control-center";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-pWliIq01P8+aB8QG4ofsyROOJQZFyypZQaiP8GhWWME=";
|
||||
sha256 = "sha256-6gxxSExlzizBE3b5sB5iEfpKf/0zT0MH/FLJPw/d1Mc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -42,11 +42,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-software";
|
||||
version = "41.0";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "AkC3bsnfYi2b7A6zjkrFY8rt5oCLrZO4gmPYCXD/OcE=";
|
||||
sha256 = "eil3Ziga8tvsyssQJMcT7ISYxoJ++RJG6d6Grpof4Xs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, stdenv
|
||||
{ stdenv
|
||||
, lib
|
||||
, substituteAll
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, which
|
||||
|
|
@ -23,6 +25,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "161050sx3sdxqcpjkjcpf6wl4kx0jydihga7mcvrj9c2f8ly0g07";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Make PyGObject’s gi library available.
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [
|
||||
python3.pkgs.pygobject3
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
which
|
||||
|
|
|
|||
14
pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch
Normal file
14
pkgs/desktops/gnome/misc/nautilus-python/fix-paths.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/nautilus-python.c b/src/nautilus-python.c
|
||||
index 843e3c6..466a513 100644
|
||||
--- a/src/nautilus-python.c
|
||||
+++ b/src/nautilus-python.c
|
||||
@@ -184,6 +184,9 @@ nautilus_python_init_python (void) {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ debug("Add PyGObject to path");
|
||||
+ PyRun_SimpleString("import site;import functools; functools.reduce(lambda k, p: site.addsitedir(p, k), [@pythonPaths@], site._init_pathinfo())");
|
||||
+
|
||||
/* import gobject */
|
||||
debug("init_pygobject");
|
||||
if (!np_init_pygobject()) {
|
||||
|
|
@ -5,7 +5,8 @@
|
|||
, runCommandLocal
|
||||
, bison
|
||||
, flex
|
||||
, llvmPackages_8
|
||||
, llvmPackages_11
|
||||
, lld_11
|
||||
, opencl-clang
|
||||
, python3
|
||||
, spirv-llvm-translator
|
||||
|
|
@ -14,7 +15,13 @@
|
|||
}:
|
||||
|
||||
let
|
||||
llvmPkgs = llvmPackages_8 // {
|
||||
vc_intrinsics_src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "vc-intrinsics";
|
||||
rev = "e5ad7e02aa4aa21a3cd7b3e5d1f3ec9b95f58872";
|
||||
sha256 = "Vg1mngwpIQ3Tik0GgRXPG22lE4sLEAEFch492G2aIXs=";
|
||||
};
|
||||
llvmPkgs = llvmPackages_11 // {
|
||||
inherit spirv-llvm-translator;
|
||||
};
|
||||
inherit (llvmPkgs) llvm;
|
||||
|
|
@ -24,18 +31,18 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-graphics-compiler";
|
||||
version = "1.0.4241";
|
||||
version = "1.0.8744";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "intel-graphics-compiler";
|
||||
rev = "igc-${version}";
|
||||
sha256 = "1jp3c67ppl1x4pazr5nzy52615cpx0kyckaridhc0fsmrkgilyxq";
|
||||
sha256 = "G5+dYD8uZDPkRyn1sgXsRngdq4NJndiCJCYTRXyUgTA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ clang cmake bison flex python3 ];
|
||||
|
||||
buildInputs = [ clang opencl-clang spirv-llvm-translator llvm ];
|
||||
buildInputs = [ clang opencl-clang spirv-llvm-translator llvm lld_11 ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
|
@ -53,9 +60,12 @@ stdenv.mkDerivation rec {
|
|||
ln -s clang $out/clang-${versions.major (getVersion clang)}
|
||||
ln -s ${opencl-clang}/lib/* $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c.h $out/
|
||||
ln -s ${lib.getLib libclang}/lib/clang/${getVersion clang}/include/opencl-c-base.h $out/
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DVC_INTRINSICS_SRC=${vc_intrinsics_src}"
|
||||
"-DINSTALL_SPIRVDLL=0"
|
||||
"-DCCLANG_BUILD_PREBUILDS=ON"
|
||||
"-DCCLANG_BUILD_PREBUILDS_DIR=${prebuilds}"
|
||||
"-DIGC_PREFERRED_LLVM_VERSION=${getVersion llvm}"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchurl, makeWrapper, jre, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.0.0";
|
||||
version = "3.1.0";
|
||||
pname = "dotty-bare";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/lampepfl/dotty/releases/download/${version}/scala3-${version}.tar.gz";
|
||||
sha256 = "/F2yv4XH0I3oC3IFqj+jwpzShCtTEfTzg+J26Xl+P+Y=";
|
||||
sha256 = "9bsZ2FtIb6AvA3W3r2Vv0dPNicuYjMBz3X48z45Avv8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jre ncurses.dev ] ;
|
||||
|
|
|
|||
|
|
@ -2,29 +2,30 @@
|
|||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
|
||||
, lit
|
||||
, llvm_8
|
||||
, llvm_11
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "SPIRV-LLVM-Translator";
|
||||
version = "8.0.1-2";
|
||||
version = "unstable-2021-06-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "SPIRV-LLVM-Translator";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hxalc3fkliqs61hpr97phbm3qsx4b8vgnlg30aimzr6aas403r5";
|
||||
rev = "c67e6f26a7285aa753598ef792593ac4a545adf9";
|
||||
sha256 = "sha256-1s3lVNTQDl+pUvbzSMsp3cOUSm6I4DzqJxnLMeeE3F4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config cmake llvm_8.dev ];
|
||||
nativeBuildInputs = [ pkg-config cmake llvm_11.dev ];
|
||||
|
||||
buildInputs = [ llvm_8 ];
|
||||
buildInputs = [ llvm_11 ];
|
||||
|
||||
checkInputs = [ lit ];
|
||||
|
||||
cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" ];
|
||||
cmakeFlags = [
|
||||
"-DLLVM_INCLUDE_TESTS=ON"
|
||||
];
|
||||
|
||||
# FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
with lib; mkCoqDerivation {
|
||||
|
||||
pname = "CoqEAL";
|
||||
owner = "CoqEAL";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (isGe "8.10") "1.12.0" ]; out = "1.0.6"; }
|
||||
{ cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.0.6"; }
|
||||
{ cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
|
||||
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
|
||||
{ cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; }
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ with lib;
|
|||
owner = "arthuraa";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.11" "8.14"; out = "0.3.0"; }
|
||||
{ case = range "8.10" "8.12"; out = "0.2.2"; }
|
||||
defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [
|
||||
{ cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; }
|
||||
{ cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; }
|
||||
] null;
|
||||
|
||||
releaseRev = v: "v${v}";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, version ? null }:
|
||||
{ lib, mkCoqDerivation, coq, hydra-battles, gaia,
|
||||
mathcomp-zify, mathcomp, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation rec {
|
||||
pname = "gaia-hydras";
|
||||
|
|
@ -8,8 +9,8 @@ with lib; mkCoqDerivation rec {
|
|||
releaseRev = (v: "v${v}");
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.14"; out = "0.5"; }
|
||||
defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [
|
||||
{ cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,11 +5,12 @@ with lib; mkCoqDerivation {
|
|||
|
||||
release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5";
|
||||
release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi";
|
||||
release."1.13".sha256 = "sha256:0i8ix2rbw10v34bi0yrx0z89ng96ydqbxm8rv2rnfgy4d1b27x6q";
|
||||
releaseRev = (v: "v${v}");
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.12"; }
|
||||
{ cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.13"; }
|
||||
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; }
|
||||
] null;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,13 +6,17 @@ mkCoqDerivation {
|
|||
pname = "abel";
|
||||
owner = "math-comp";
|
||||
|
||||
release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.10" "8.13") (range "1.11.0" "1.12.0") ]; out = "1.0.0"; }
|
||||
{ cases = [ (range "8.10" "8.14") (range "1.12.0" "1.13.0") ]; out = "1.2.0"; }
|
||||
{ cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; }
|
||||
] null;
|
||||
|
||||
release."1.2.0".sha256 = "1picd4m85ipj22j3b84cv8ab3330radzrhd6kp0gpxq14dhv02c2";
|
||||
release."1.1.2".sha256 = "0565w713z1cwxvvdlqws2z5lgdys8lddf0vpwfdj7bpd7pq9hwxg";
|
||||
release."1.0.0".sha256 = "190jd8hb8anqsvr9ysr514pm5sh8qhw4030ddykvwxx9d9q6rbp3";
|
||||
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.field mathcomp-real-closed ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let mca = mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.11" "8.13") "1.12.0" ]; out = "0.3.10"; }
|
||||
{ cases = [ (range "8.11" "8.14") (isGe "1.12.0") ]; out = "0.3.10"; }
|
||||
{ cases = [ (range "8.11" "8.13") "1.11.0" ]; out = "0.3.4"; }
|
||||
{ cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "0.3.3"; }
|
||||
{ cases = [ (range "8.10" "8.11") "1.11.0" ]; out = "0.3.1"; }
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ with lib; mkCoqDerivation {
|
|||
owner = "math-comp";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (isGe "8.10") (range "1.11" "1.12") ]; out = "1.5.1"; }
|
||||
{ cases = [ (isGe "8.10") (range "1.11" "1.13") ]; out = "1.5.1"; }
|
||||
{ cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; }
|
||||
{ cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; }
|
||||
{ cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; }
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ with lib; mkCoqDerivation {
|
|||
};
|
||||
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (isGe "8.10") "1.12.0" ]; out = "1.1.2"; }
|
||||
{ cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; }
|
||||
{ cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; }
|
||||
{ cases = [ (isGe "8.7") (range "1.9.0" "1.10.0") ]; out = "1.0.4"; }
|
||||
{ cases = [ (isGe "8.7") "1.8.0" ]; out = "1.0.3"; }
|
||||
|
|
|
|||
22
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
Normal file
22
pkgs/development/coq-modules/mathcomp-tarjan/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ coq, mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup,
|
||||
lib, version ? null }@args:
|
||||
with lib; mkCoqDerivation {
|
||||
|
||||
namePrefix = [ "coq" "mathcomp" ];
|
||||
pname = "tarjan";
|
||||
owner = "math-comp";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with versions;
|
||||
switch [ coq.version mathcomp-ssreflect.version ] [{
|
||||
cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0";
|
||||
}] null;
|
||||
release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1";
|
||||
|
||||
propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup ];
|
||||
|
||||
meta = {
|
||||
description = "Proofs of Tarjan and Kosaraju connected components algorithms";
|
||||
license = licenses.cecill-b;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,14 +1,15 @@
|
|||
{ lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }:
|
||||
|
||||
with lib; mkCoqDerivation rec {
|
||||
pname = "mathcomp-zify";
|
||||
namePrefix = [ "coq" "mathcomp" ];
|
||||
pname = "zify";
|
||||
repo = "mczify";
|
||||
owner = "math-comp";
|
||||
inherit version;
|
||||
|
||||
defaultVersion = with versions;
|
||||
switch [ coq.coq-version mathcomp-algebra.version ] [
|
||||
{ cases = [ (range "8.13" "8.14") (isEq "1.12") ]; out = "1.1.0+1.12+8.13"; }
|
||||
{ cases = [ (range "8.13" "8.14") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; }
|
||||
] null;
|
||||
|
||||
release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ let
|
|||
owner = "math-comp";
|
||||
withDoc = single && (args.withDoc or false);
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.10"; out = "1.12.0"; }
|
||||
{ case = isGe "8.14"; out = "1.13.0"; }
|
||||
{ case = range "8.10" "8.13"; out = "1.12.0"; }
|
||||
{ case = range "8.7" "8.12"; out = "1.11.0"; }
|
||||
{ case = range "8.7" "8.11"; out = "1.10.0"; }
|
||||
{ case = range "8.7" "8.11"; out = "1.9.0"; }
|
||||
|
|
@ -28,6 +29,7 @@ let
|
|||
{ case = range "8.5" "8.7"; out = "1.6.4"; }
|
||||
] null;
|
||||
release = {
|
||||
"1.13.0".sha256 = "0j4cz2y1r1aw79snkcf1pmicgzf8swbaf9ippz0vg99a572zqzri";
|
||||
"1.12.0".sha256 = "1ccfny1vwgmdl91kz5xlmhq4wz078xm4z5wpd0jy5rn890dx03wp";
|
||||
"1.11.0".sha256 = "06a71d196wd5k4wg7khwqb7j7ifr7garhwkd54s86i0j7d6nhl3c";
|
||||
"1.10.0".sha256 = "1b9m6pwxxyivw7rgx82gn5kmgv2mfv3h3y0mmjcjfypi8ydkrlbv";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ with lib; mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.10" "8.14") "1.12.0" ]; out = "1.5.4"; }
|
||||
{ cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.5.4"; }
|
||||
{ cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; }
|
||||
{ cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; }
|
||||
{ cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ mkCoqDerivation {
|
|||
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch mathcomp.character.version [
|
||||
{ case = pred.union (isGe "1.10.0") (isEq "dev"); out = "1.12.0"; }
|
||||
{ case = (range "1.10.0" "1.12.0"); out = "1.12.0"; }
|
||||
] null;
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.character ];
|
||||
|
|
|
|||
|
|
@ -90,6 +90,7 @@ in stdenv.mkDerivation rec {
|
|||
"-DARROW_BUILD_TESTS=ON"
|
||||
"-DARROW_VERBOSE_THIRDPARTY_BUILD=ON"
|
||||
"-DARROW_DEPENDENCY_SOURCE=SYSTEM"
|
||||
"-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent)
|
||||
"-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}"
|
||||
"-DARROW_COMPUTE=ON"
|
||||
"-DARROW_CSV=ON"
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-online-accounts";
|
||||
version = "3.40.0";
|
||||
version = "3.40.1";
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
|
||||
src = fetchFromGitLab {
|
||||
|
|
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "GNOME";
|
||||
repo = "gnome-online-accounts";
|
||||
rev = version;
|
||||
sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU=";
|
||||
sha256 = "sha256-q4bLGOOGoGH/Et3hu7/372tjNMouX9ePTanIo0c4Jbw=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "man" "dev" "devdoc" ];
|
||||
|
|
@ -90,6 +90,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
versionPolicy = "odd-unstable";
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ with lib;
|
|||
let
|
||||
# Release calendar: https://www.mesa3d.org/release-calendar.html
|
||||
# Release frequency: https://www.mesa3d.org/releasing.html#schedule
|
||||
version = "21.2.4";
|
||||
version = "21.2.5";
|
||||
branch = versions.major version;
|
||||
|
||||
self = stdenv.mkDerivation {
|
||||
|
|
@ -47,7 +47,7 @@ self = stdenv.mkDerivation {
|
|||
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-/m7egtGsAjOdo8LsGCCjeWQZAv01GlLMARU/du/4W0Q=";
|
||||
sha256 = "1fxcdf4qs4vmyjcns7jv62w4jy3gr383ar5b7mr77nb0nxgmhjcf";
|
||||
};
|
||||
|
||||
# TODO:
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
, cmake
|
||||
, git
|
||||
|
||||
, llvmPackages_8
|
||||
, llvmPackages_11
|
||||
, spirv-llvm-translator
|
||||
|
||||
, buildWithPatches ? true
|
||||
}:
|
||||
|
||||
let
|
||||
llvmPkgs = llvmPackages_8 // {
|
||||
llvmPkgs = llvmPackages_11 // {
|
||||
inherit spirv-llvm-translator;
|
||||
};
|
||||
|
||||
|
|
@ -31,7 +31,8 @@ let
|
|||
});
|
||||
|
||||
passthru = rec {
|
||||
|
||||
spirv-llvm-translator = llvmPkgs.spirv-llvm-translator;
|
||||
llvm = addPatches "llvm" llvmPkgs.llvm;
|
||||
libclang = addPatches "clang" llvmPkgs.libclang;
|
||||
|
||||
clang-unwrapped = libclang.out;
|
||||
|
|
@ -43,14 +44,21 @@ let
|
|||
patchesOut = stdenv.mkDerivation rec {
|
||||
pname = "opencl-clang-patches";
|
||||
inherit (library) version src patches;
|
||||
# Clang patches assume the root is the llvm root dir
|
||||
# but clang root in nixpkgs is the clang sub-directory
|
||||
postPatch = ''
|
||||
for filename in patches/clang/*.patch; do
|
||||
substituteInPlace "$filename" \
|
||||
--replace "a/clang/" "a/" \
|
||||
--replace "b/clang/" "b/"
|
||||
done
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
[ -d patches ] && cp -r patches/ $out || mkdir $out
|
||||
mkdir -p $out/clang $out/spirv
|
||||
mkdir -p $out/clang $out/llvm
|
||||
'';
|
||||
};
|
||||
|
||||
spirv-llvm-translator = addPatches "spirv" llvmPkgs.spirv-llvm-translator;
|
||||
|
||||
};
|
||||
|
||||
library = let
|
||||
|
|
@ -59,15 +67,15 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opencl-clang";
|
||||
version = "unstable-2019-08-16";
|
||||
version = "unstable-2021-06-22";
|
||||
|
||||
inherit passthru;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "opencl-clang";
|
||||
rev = "94af090661d7c953c516c97a25ed053c744a0737";
|
||||
sha256 = "05cg89m62nqjqm705h7gpdz4jd4hiczg8944dcjsvaybrqv3hcm5";
|
||||
rev = "fd68f64b33e67d58f6c36b9e25c31c1178a1962a";
|
||||
sha256 = "sha256-q1YPBb/LY67iEuQx1fMUQD/I7OsNfobW3yNfJxLXx3E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
24
pkgs/development/python-modules/flashtext/default.nix
Normal file
24
pkgs/development/python-modules/flashtext/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flashtext";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1kq5idfp9skqkjdcld40igxn2yqjly8jpmxawkp0skwxw29jpgm1";
|
||||
};
|
||||
|
||||
# json files that tests look for don't exist in the pypi dist
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://github.com/vi3k6i5/flashtext";
|
||||
description = "Python package to replace keywords in sentences or extract keywords from sentences";
|
||||
maintainers = with maintainers; [ aanderse ];
|
||||
license = with licenses; [ mit ];
|
||||
};
|
||||
}
|
||||
21
pkgs/development/python-modules/striprtf/default.nix
Normal file
21
pkgs/development/python-modules/striprtf/default.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "striprtf";
|
||||
version = "0.0.15";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1yvgnmds034z28mscff0amm0g47ni0753nshvrq2swdpipymiwz0";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/joshy/striprtf";
|
||||
description = "A simple library to convert rtf to text";
|
||||
maintainers = with maintainers; [ aanderse ];
|
||||
license = with licenses; [ bsd3 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epson-inkjet-printer-escpr2";
|
||||
version = "1.1.38";
|
||||
version = "1.1.42";
|
||||
|
||||
src = fetchurl {
|
||||
# To find new versions, visit
|
||||
|
|
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
|
|||
# version.
|
||||
# NOTE: Don't forget to update the webarchive link too!
|
||||
urls = [
|
||||
"https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm"
|
||||
"https://web.archive.org/web/20210731163511/https://download3.ebz.epson.net/dsc/f/03/00/12/91/84/6902a4d11864b195ddda45f6de968d8ec1ee9e3b/epson-inkjet-printer-escpr2-1.1.38-1lsb3.2.src.rpm"
|
||||
"https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm"
|
||||
"https://web.archive.org/web/20211029093638/https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm"
|
||||
];
|
||||
sha256 = "sha256-rQtmWREZKtu5MuqEn91/1+SfGol4f8jKzd1mQ0e3h1c=";
|
||||
sha256 = "sha256-CsZUurwwoXNWONZKAIkRd0ztmAr5wLWZhirCzJWWqMA=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-compute-runtime";
|
||||
version = "20.34.17727";
|
||||
version = "21.42.21270";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "compute-runtime";
|
||||
rev = version;
|
||||
sha256 = "19scbbr6jf3yp2v7z8xyzzm01g44jym7xfkf1dz64d5nhvjw6ig5";
|
||||
sha256 = "N9MsDcsL8kBWxfZjhukcxZiSJnXxqMgWF0etOhf2/AE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "credhub-cli";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudfoundry-incubator";
|
||||
repo = "credhub-cli";
|
||||
rev = version;
|
||||
sha256 = "1j0i0b79ph2i52cj0qln8wvp6gwhl73akkn026h27vvmlw9sndc2";
|
||||
sha256 = "sha256-2+KOf6VQ1jTXfFE+Ptd3iiOEhvENU0XUclQ+e85DpUo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -12,16 +12,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gocryptfs";
|
||||
version = "2.1";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rfjakob";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nACBEOL/vnqxdAGI37k9bxgQKgpi35/tsuCxsQ9I2sw=";
|
||||
sha256 = "sha256-qERtX9UcdMolbffzPiVQlblirzJ5baOmHonJIO8ang0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Q/oBT5xdLpgQCIk7KES6c8+BaCQVUIwCwVufl4oTFRs=";
|
||||
vendorSha256 = "sha256-yJ7RYwhArgmGlFmSplrX1hiLkc7FkS1qQCUcRlbnNWQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "svtplay-dl";
|
||||
version = "4.7";
|
||||
version = "4.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spaam";
|
||||
repo = "svtplay-dl";
|
||||
rev = version;
|
||||
sha256 = "19ajm4bf7knnchggfbajx0c29q4sj8ffsvqmgizgsjdz48ppx2yf";
|
||||
sha256 = "1mlf0yvj3zy3df0ip7qb6g4v7032rsz038a7d25zn6yfzsz04br3";
|
||||
};
|
||||
|
||||
pythonPaths = [ cryptography pyyaml requests ];
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ buildGoModule rec {
|
|||
homepage = "https://github.com/txthinking/brook";
|
||||
description = "A cross-platform Proxy/VPN software";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ xrelkd ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://ssldump.sourceforge.net";
|
||||
license = "BSD-style";
|
||||
maintainers = with maintainers; [ aycanirican ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ let
|
|||
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
|
||||
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
|
||||
mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};
|
||||
mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
|
||||
metalib = callPackage ../development/coq-modules/metalib { };
|
||||
multinomials = callPackage ../development/coq-modules/multinomials {};
|
||||
odd-order = callPackage ../development/coq-modules/odd-order { };
|
||||
|
|
|
|||
|
|
@ -2701,6 +2701,8 @@ in {
|
|||
|
||||
flammkuchen = callPackage ../development/python-modules/flammkuchen { };
|
||||
|
||||
flashtext = callPackage ../development/python-modules/flashtext { };
|
||||
|
||||
flask-admin = callPackage ../development/python-modules/flask-admin { };
|
||||
|
||||
flask-api = callPackage ../development/python-modules/flask-api { };
|
||||
|
|
@ -8880,6 +8882,8 @@ in {
|
|||
|
||||
stripe = callPackage ../development/python-modules/stripe { };
|
||||
|
||||
striprtf = callPackage ../development/python-modules/striprtf { };
|
||||
|
||||
structlog = callPackage ../development/python-modules/structlog { };
|
||||
|
||||
stumpy = callPackage ../development/python-modules/stumpy { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue