forked from mirrors/nixpkgs
Merge pull request #41759 from bhipple/fix/pcsclite
pcsclite: fix URL for debian move to gitlab
This commit is contained in:
Matthew Justin Bauer
GitHub
commit
f523dc9025
|
|
@ -23,7 +23,7 @@
|
|||
, alsaLib
|
||||
, libidn
|
||||
, zlib
|
||||
, version ? "13.9.0"
|
||||
, version ? "13.9.1"
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -209,6 +209,7 @@ let
|
|||
find $ICAInstDir -type f -exec file {} \; |
|
||||
grep 'ELF.*executable' |
|
||||
cut -f 1 -d : |
|
||||
grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729
|
||||
while read f
|
||||
do
|
||||
echo "Patching ELF intrepreter and rpath for $f"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,8 @@ GEM
|
|||
coderay (1.1.2)
|
||||
eventmachine (1.2.7)
|
||||
htmlentities (4.3.4)
|
||||
kramdown (1.16.2)
|
||||
jaro_winkler (1.5.1)
|
||||
kramdown (1.17.0)
|
||||
mini_portile2 (2.3.0)
|
||||
nokogiri (1.8.2)
|
||||
mini_portile2 (~> 2.3.0)
|
||||
|
|
@ -16,7 +17,8 @@ GEM
|
|||
rainbow (3.0.0)
|
||||
reverse_markdown (1.1.0)
|
||||
nokogiri
|
||||
rubocop (0.56.0)
|
||||
rubocop (0.57.1)
|
||||
jaro_winkler (~> 1.5.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.5)
|
||||
powerpack (~> 0.1)
|
||||
|
|
@ -24,11 +26,11 @@ GEM
|
|||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
ruby-progressbar (1.9.0)
|
||||
solargraph (0.21.1)
|
||||
solargraph (0.22.0)
|
||||
coderay (~> 1.1)
|
||||
eventmachine (~> 1.2, >= 1.2.5)
|
||||
htmlentities (~> 4.3, >= 4.3.4)
|
||||
kramdown
|
||||
kramdown (~> 1.16)
|
||||
parser (~> 2.4)
|
||||
reverse_markdown (~> 1.0, >= 1.0.5)
|
||||
rubocop (~> 0.52)
|
||||
|
|
@ -37,8 +39,8 @@ GEM
|
|||
yard (~> 0.9)
|
||||
thor (0.20.0)
|
||||
tilt (2.0.8)
|
||||
unicode-display_width (1.3.2)
|
||||
yard (0.9.12)
|
||||
unicode-display_width (1.4.0)
|
||||
yard (0.9.14)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
|
|||
|
|
@ -31,13 +31,21 @@
|
|||
};
|
||||
version = "4.3.4";
|
||||
};
|
||||
jaro_winkler = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
};
|
||||
kramdown = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
|
||||
sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.2";
|
||||
version = "1.17.0";
|
||||
};
|
||||
mini_portile2 = {
|
||||
source = {
|
||||
|
|
@ -99,13 +107,13 @@
|
|||
version = "1.1.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04j2n2zilvfw46v94mpymwnfzni0jq05fz6gs3yi2na7l4c98zv8";
|
||||
sha256 = "1rm2fidc3zkxamfvn53aa6mz4rr0qx6fhcnxc83bn4myv59gw9dd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.56.0";
|
||||
version = "0.57.1";
|
||||
};
|
||||
ruby-progressbar = {
|
||||
source = {
|
||||
|
|
@ -119,10 +127,10 @@
|
|||
dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18wkmbhymhwpdy4638bmdslniy2mjwldms5p61r6jnxzc7qnnalf";
|
||||
sha256 = "1khj0bpyr7mwbjxd9x2al78rcw5k7s87ncrql5ml0ykqx57w7b7l";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.21.1";
|
||||
version = "0.22.0";
|
||||
};
|
||||
thor = {
|
||||
source = {
|
||||
|
|
@ -143,17 +151,17 @@
|
|||
unicode-display_width = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
|
||||
sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
};
|
||||
yard = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "11x58w0ccayvgy0lmhfyrzxd33ya1v41prh5zzhvaajhw8vr74lh";
|
||||
sha256 = "08kww2m1izjq56q2va2my0x3f3f0xsg6f07b6sgb4nl0scr6y10q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.9.12";
|
||||
version = "0.9.14";
|
||||
};
|
||||
}
|
||||
|
|
@ -26,13 +26,13 @@ let
|
|||
};
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
name = "matrix-synapse-${version}";
|
||||
version = "0.30.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "synapse";
|
||||
rev = "v${version}";
|
||||
sha256 = "10ggv7669ngxs8py82k8z24874ga0ldcxvpp7xhjpbr1s0gw8zv8";
|
||||
sha256 = "1lrbjqa9rxn2prbnha9aghnwyi4z1rpfd7bk0bjsjixjl389d6d8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -42,7 +42,7 @@ in pythonPackages.buildPythonApplication rec {
|
|||
propagatedBuildInputs = with pythonPackages; [
|
||||
blist canonicaljson daemonize dateutil frozendict pillow pyasn1
|
||||
pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
|
||||
signedjson systemd twisted ujson unpaddedbase64 pyyaml
|
||||
signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
|
||||
matrix-angular-sdk bleach netaddr jinja2 psycopg2
|
||||
psutil msgpack-python lxml matrix-synapse-ldap3
|
||||
phonenumbers jsonschema affinity bcrypt
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl
|
||||
{ stdenv, fetchurl, fetchpatch
|
||||
, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
|
||||
(fetchpatch {
|
||||
name = "sysmalloc.patch";
|
||||
url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf";
|
||||
sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67";
|
||||
});
|
||||
|
||||
meta = with stdenv.lib;{
|
||||
description = "An enhanced version of the Berkeley UNIX C shell (csh)";
|
||||
longDescription = ''
|
||||
|
|
@ -33,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.tcsh.org/;
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "aria2-${version}";
|
||||
version = "1.33.1";
|
||||
version = "1.34.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aria2";
|
||||
repo = "aria2";
|
||||
rev = "release-${version}";
|
||||
sha256 = "0ai84ijgsvnixwhxkj8if2mj9hcg2a41w81vy8bdvi89h3bmq9zf";
|
||||
sha256 = "0hwqnjyszasr6049vr5mn48slb48v5kw39cbpbxa68ggmhj9bw6m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2
|
||||
{ stdenv, fetchFromGitLab, pkgconfig, udev, dbus_libs, perl, python2
|
||||
, IOKit ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pcsclite-${version}";
|
||||
version = "1.8.23";
|
||||
|
||||
src = fetchurl {
|
||||
# This URL changes in unpredictable ways, so it is not sensible
|
||||
# to put a version variable in there.
|
||||
url = "https://alioth.debian.org/frs/download.php/file/4235/pcsc-lite-1.8.23.tar.bz2";
|
||||
sha256 = "1jc9ws5ra6v3plwraqixin0w0wfxj64drahrbkyrrwzghqjjc9ss";
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "pcsc-lite";
|
||||
rev = "upstream%2F${version}";
|
||||
sha256 = "09b7a79hjkgiyvhyvwf8gpxaf8b7wd0342hx6zrpd269hhfbjvwy";
|
||||
};
|
||||
|
||||
patches = [ ./no-dropdir-literals.patch ];
|
||||
|
|
@ -36,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Middleware to access a smart card using SCard API (PC/SC)";
|
||||
homepage = http://pcsclite.alioth.debian.org/;
|
||||
homepage = https://salsa.debian.org/debian/pcsc-lite;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ viric wkennington ];
|
||||
platforms = with platforms; unix;
|
||||
|
|
|
|||
Loading…
Reference in a new issue