public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-01-17 17:08:16 +01:00
parent e5fa0ab1c4 f0ce34634a
commit bcd8c6b8dc
167 changed files with 3702 additions and 1266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/coz/default.nix
View File

@@ -7,13 +7,13 @@
}:
stdenv.mkDerivation rec {
pname = "coz";
version = "0.2.0";
version = "0.2.1";
src = fetchFromGitHub {
owner = "plasma-umass";
repo = "coz";
rev = version;
sha256 = "0a55q3s8ih1r9x6fp7wkg3n5h1yd9pcwg74k33d1r94y3j3m0znr";
sha256 = "0val36yw987b1558iiyk3nqg0yy5k9y5wh49v91zj3cs58mmfyhc";
};
postConfigure = ''

10
pkgs/development/tools/buildah/default.nix
View File

@@ -4,13 +4,13 @@
buildGoPackage rec {
pname = "buildah";
version = "1.12.0";
version = "1.13.1";
src = fetchFromGitHub {
owner = "containers";
repo = "buildah";
rev = "v${version}";
sha256 = "0lsjsfp6ls38vlgibbnsyd1m7jvmjwdmpyrd0qigp4aa2abwi4dg";
sha256 = "0swhpdr970ik6fhvmj45r84lsp1n6rxm0bgv9i1lvrxy1mdv7r9x";
};
outputs = [ "bin" "man" "out" ];
@@ -18,10 +18,6 @@ buildGoPackage rec {
goPackagePath = "github.com/containers/buildah";
excludedPackages = [ "tests" ];
# Disable module-mode, because Go 1.13 automatically enables it if there is
# go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380
GO111MODULE = "off";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs ostree libselinux libseccomp ];
@@ -31,6 +27,7 @@ buildGoPackage rec {
pushd go/src/${goPackagePath}
make GIT_COMMIT="unknown"
install -Dm755 buildah $bin/bin/buildah
install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah
'';
postBuild = ''
@@ -40,6 +37,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "A tool which facilitates building OCI images";
homepage = "https://github.com/containers/buildah";
changelog = "https://github.com/containers/buildah/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ];
};

4
pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
View File

@@ -5,9 +5,9 @@ callPackage ./generic.nix (args // rec {
owner = "buildkite";
repo = "agent";
rev = "v${version}";
sha256 = "0sr1rxl92d4wdipl66f1yymx5bmyj1y85v6k22v57rzr6yhyfmsf";
sha256 = "0a7x919kxnpdn0pnhc5ilx1z6ninx8zgjvsd0jcg4qwh0qqp5ppr";
};
version = "3.8.4";
version = "3.17.0";
hasBootstrapScript = false;
postPatch = ''
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash

1846
pkgs/development/tools/geckodriver/cargo-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

29
pkgs/development/tools/geckodriver/default.nix
View File

@@ -1,27 +1,30 @@
{ lib
, fetchFromGitHub
, fetchzip
, rustPlatform
, stdenv
, darwin
}:
with rustPlatform;
buildRustPackage rec {
version = "0.22.0";
rustPlatform.buildRustPackage {
version = "0.26.0";
pname = "geckodriver";
sourceRoot = "source/testing/geckodriver";
src = fetchFromGitHub {
owner = "mozilla";
repo = "geckodriver";
rev = "v${version}";
sha256 = "12m95lfqwdxs2m5kjh3yrpm9w2li5m8n3fw46a2nkxyfw6c94l4b";
};
# Source revisions are noted alongside the binary releases:
# https://github.com/mozilla/geckodriver/releases
src = (fetchzip {
url = "https://hg.mozilla.org/mozilla-central/archive/e9783a644016aa9b317887076618425586730d73.zip/testing";
sha256 = "0m86hqyq1jrr49jkc8mnlmx4bdq281hyxhcrrzacyv20nlqwvd8v";
}).overrideAttrs (_: {
# normally guessed by the url's file extension, force it to unpack properly
unpackCmd = "unzip $curSrc";
});
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "07w5lmvm5w6id0qikcs968n0c69bb6fav63l66bskxcjva67d6dy";
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
cargoSha256 = "1pwg35kgn5z2zrlj1dwcbbdmkgmnvfxpxv4klzsxxg4m9xr1pfy4";
meta = with lib; {
description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers";
homepage = https://github.com/mozilla/geckodriver;

4
pkgs/development/tools/git-quick-stats/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "git-quick-stats";
version = "2.0.11";
version = "2.0.12";
src = fetchFromGitHub {
repo = "git-quick-stats";
owner = "arzzen";
rev = version;
sha256 = "19chwnc936bxf0bnxsvw6nhfxnj0216jx9ajjckw3q440l932799";
sha256 = "1diisgz8xc2ghsfdz3vh6z4vn13vvb9gf0i6qml0a46a5fqf32zb";
};
PREFIX = builtins.placeholder "out";
meta = with stdenv.lib; {

4
pkgs/development/tools/kind/default.nix
View File

@@ -4,13 +4,13 @@ with stdenv.lib;
buildGoPackage rec {
pname = "kind";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "165nwkhsa12z043rvkdf977jndhp82x7sccqfy75pkx99mzz43r2";
sha256 = "0hvb0rbi1m0d1flk15l3wws96kmmjhsy6islkhy5h7jalc4k0nx4";
};
goDeps = ./deps.nix;

24
pkgs/development/tools/kind/deps.nix generated
View File

@@ -374,8 +374,8 @@
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "v0.0.10";
sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r";
rev = "v0.0.11";
sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali";
};
}
{
@@ -455,8 +455,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "v1.2.0";
sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy";
rev = "v1.6.0";
sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq";
};
}
{
@@ -464,8 +464,8 @@
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "v0.8.1";
sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1";
rev = "v0.9.0";
sha256 = "1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh";
};
}
{
@@ -608,8 +608,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "c1f44814a5cd";
sha256 = "1a6hb4326hk8hvcbs0pqypalsxzqc8xasnglrrwd6ai0njgh18pg";
rev = "86b910548bc1";
sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44";
};
}
{
@@ -671,8 +671,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "v2.2.5";
sha256 = "08smz8dfyxp02ha74my9iszqa5qzgl3ksi28ilyp8lqipssiq6fg";
rev = "v2.2.7";
sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
};
}
{
@@ -680,8 +680,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v3";
rev = "e228e37189d3";
sha256 = "06sc63lqhkqjh188md1cywvscxq40cqgmdl8ccd3q891b1xpajl4";
rev = "4206685974f2";
sha256 = "1ff5fd8x45cay9100ds63hxd32s7czsrric0ql6a1jrxczsgqk1g";
};
}
{

4
pkgs/development/tools/misc/clojure-lsp/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "clojure-lsp";
version = "20200109T185134";
version = "20200114T225020";
src = fetchurl {
url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}";
sha256 = "11fzyf2qzqmxhdyssm59cqkkcjh8hw1i859abc1i2zali3fd7w68";
sha256 = "1fx27nz79h1f3gmaw9k33dq9r28s7z8rx6hqpv44368v67d8jbhb";
};
dontUnpack = true;

4
pkgs/development/tools/misc/elfinfo/default.nix
View File

@@ -2,14 +2,14 @@
buildGoPackage rec {
pname = "elfinfo";
version = "0.7.6";
version = "1.0.1";
goPackagePath = "github.com/xyproto/elfinfo";
src = fetchFromGitHub {
rev = version;
owner = "xyproto";
repo = "elfinfo";
sha256 = "0f6ik4d157assxdfslnyc91mg70kfh396rapikfv473znx2v2pg9";
sha256 = "1iahivc1jm9gv1dijykw2pryjdwb896bv42xmq9v6ax86rsnzqww";
};
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/pwndbg/default.nix
View File

@@ -21,14 +21,14 @@ let
in stdenv.mkDerivation rec {
pname = "pwndbg";
version = "2019.01.25";
version = "2019.12.09";
format = "other";
src = fetchFromGitHub {
owner = "pwndbg";
repo = "pwndbg";
rev = version;
sha256 = "0k7n6pcrj62ccag801yzf04a9mj9znghpkbnqwrzz0qn3rs42vgs";
sha256 = "0kn28mjdq91zf7d6vqzbm74f0ligp829m9jzjxfn4zlx6wrmkd0s";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/misc/reviewdog/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "reviewdog";
version = "0.9.15";
version = "0.9.17";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "05dh70967264lc3srwajnxxfdgsgybc9i7j2jqbqzin6dmxbnrc0";
sha256 = "0fm7avkc8izs0a9lqshibzpl08g4l3w38ayw7g521p23aq90q3c9";
};
modSha256 = "09ifp0iqd8jlz01mhxaz7adrcc699vim6pwxgf83pmqdw92jz034";
modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw";
subPackages = [ "cmd/reviewdog" ];

139
pkgs/development/tools/misc/usb-modeswitch/configurable-usb-modeswitch.patch
View File

@@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index 463a11f..f20072c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@ CFLAGS += -Wall
Index: usb-modeswitch-2.6.0/Makefile
===================================================================
--- usb-modeswitch-2.6.0.orig/Makefile
+++ usb-modeswitch-2.6.0/Makefile
@@ -5,17 +5,24 @@ CFLAGS += -Wall -Wno-deprecated-dec
LIBS = `pkg-config --libs --cflags libusb-1.0`
RM = /bin/rm -f
OBJS = usb_modeswitch.c
@@ -16,36 +16,31 @@ index 463a11f..f20072c 100644
+UDEVDIR = $(PREFIX)/lib/udev
SBINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man/man1
VPATH = jimtcl
@@ -22,10 +22,17 @@ endif
JIM_CONFIGURE_OPTS = --disable-lineedit \
--with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr
+USE_UPSTART=$(shell if command -v initctl > /dev/null; then echo "true"; fi)
+USE_SYSTEMD=$(shell if command -v systemctl > /dev/null; then echo "true"; fi)
+
.PHONY: clean install install-common uninstall \
script shared static \
dispatcher-script dispatcher-shared dispatcher-static \
- install-script install-shared install-static
+ install-script install-shared install-static \
dispatcher-script dispatcher-dynlink dispatcher-statlink \
- install-script install-dynlink install-statlink
+ install-script install-dynlink install-statlink \
+ install-upstart install-systemd \
+ configure-dispatcher configure-script \
+ configure-upstart configure-systemd \
+ configure
all: script
all: all-with-script-dispatcher
@@ -46,7 +53,25 @@ jim/libjim.a:
cd jim && CFLAGS="$(CFLAGS)" CC="$(CC)" ./configure $(JIM_CONFIGURE_OPTS)
$(MAKE) -C jim lib
@@ -28,7 +35,25 @@ all-with-statlink-dispatcher: $(PROG) di
$(PROG): $(OBJS) usb_modeswitch.h
$(CC) -o $(PROG) $(OBJS) $(CFLAGS) $(LIBS) $(LDFLAGS)
-dispatcher-script: usb_modeswitch.tcl
-dispatcher-script: usb_modeswitch_dispatcher.tcl
+configure-dispatcher:
+ sed -i \
+ -e 's,^\(set setup(sbindir) \).*$$,\1$(SBINDIR),' \
+ -e 's,^\(set setup(etcdir) \).*$$,\1$(ETCDIR),' \
+ usb_modeswitch.tcl
+ usb_modeswitch_dispatcher.tcl
+
+configure-script:
+ sed -i -e 's,^\(SBINDIR=\).*$$,\1$(SBINDIR),' usb_modeswitch.sh
@@ -59,31 +54,22 @@ index 463a11f..f20072c 100644
+configure: configure-dispatcher configure-script \
+ configure-systemd configure-upstart
+
+dispatcher-script: configure-dispatcher usb_modeswitch.tcl
sed 's_!/usr/bin/tclsh_!'"$(TCL)"'_' < usb_modeswitch.tcl > usb_modeswitch_dispatcher
+dispatcher-script: configure-dispatcher usb_modeswitch_dispatcher.tcl
DISPATCH=dispatcher-script
cp -f usb_modeswitch_dispatcher.tcl usb_modeswitch_dispatcher
dispatcher-shared: jim/libjim.so dispatcher.c usb_modeswitch.string
@@ -55,7 +80,7 @@ dispatcher-shared: jim/libjim.so dispatcher.c usb_modeswitch.string
dispatcher-static: jim/libjim.a dispatcher.c usb_modeswitch.string
$(CC) dispatcher.c $(LDFLAGS) jim/libjim.a -Ijim -o usb_modeswitch_dispatcher $(CFLAGS)
-usb_modeswitch.string: usb_modeswitch.tcl
+usb_modeswitch.string: configure-dispatcher usb_modeswitch.tcl
$(HOST_TCL) make_string.tcl usb_modeswitch.tcl > $@
clean:
@@ -76,16 +101,28 @@ ums-clean:
@@ -53,16 +78,28 @@ distclean: clean
# If the systemd folder is present, install the service for starting the dispatcher
# If not, use the dispatcher directly from the udev rule as in previous versions
-install-common: $(PROG) usb_modeswitch_dispatcher
-install-common: $(PROG) $(DISPATCH)
- install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
- install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
- install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
- install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
- install -D --mode=644 usb_modeswitch_dispatcher.1 $(MANDIR)/usb_modeswitch_dispatcher.1
- install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
+install-common: $(PROG) configure usb_modeswitch_dispatcher
+install-common: $(PROG) configure $(DISPATCH)
+ install -D --mode=755 usb_modeswitch $(DESTDIR)$(SBINDIR)/usb_modeswitch
+ install -D --mode=755 usb_modeswitch.sh $(DESTDIR)$(UDEVDIR)/usb_modeswitch
+ install -D --mode=644 usb_modeswitch.conf $(DESTDIR)$(ETCDIR)/usb_modeswitch.conf
@@ -110,8 +96,8 @@ index 463a11f..f20072c 100644
install: install-script
@@ -96,10 +133,10 @@ install-shared: dispatcher-shared install-common
install-static: dispatcher-static install-common
@@ -73,10 +110,10 @@ install-dynlink: dispatcher-dynlink inst
install-statlink: dispatcher-statlink install-common
uninstall:
- $(RM) $(SBINDIR)/usb_modeswitch
@@ -127,10 +113,10 @@ index 463a11f..f20072c 100644
$(RM) -R $(DESTDIR)/var/lib/usb_modeswitch
- $(RM) $(SYSDIR)/usb_modeswitch@.service
+ $(RM) $(DESTDIR)$(SYSDIR)/usb_modeswitch@.service
diff --git a/usb-modeswitch-upstart.conf b/usb-modeswitch-upstart.conf
index 0d82b69..1c177b4 100644
--- a/usb-modeswitch-upstart.conf
+++ b/usb-modeswitch-upstart.conf
Index: usb-modeswitch-2.6.0/usb-modeswitch-upstart.conf
===================================================================
--- usb-modeswitch-2.6.0.orig/usb-modeswitch-upstart.conf
+++ usb-modeswitch-2.6.0/usb-modeswitch-upstart.conf
@@ -1,5 +1,5 @@
start on usb-modeswitch-upstart
task
@@ -138,13 +124,13 @@ index 0d82b69..1c177b4 100644
- exec /usr/sbin/usb_modeswitch_dispatcher --switch-mode $UMS_PARAM
+ exec @sbindir@/usb_modeswitch_dispatcher --switch-mode $UMS_PARAM
end script
diff --git a/usb_modeswitch.sh b/usb_modeswitch.sh
index eb3fa3e..0e93166 100755
--- a/usb_modeswitch.sh
+++ b/usb_modeswitch.sh
Index: usb-modeswitch-2.6.0/usb_modeswitch.sh
===================================================================
--- usb-modeswitch-2.6.0.orig/usb_modeswitch.sh
+++ usb-modeswitch-2.6.0/usb_modeswitch.sh
@@ -1,5 +1,9 @@
#!/bin/sh
# part of usb_modeswitch 2.5.2
# part of usb_modeswitch 2.6.0
+
+# Compile time configuration, injected by the Makefile
+SBINDIR=/usr/sbin
@@ -180,7 +166,7 @@ index eb3fa3e..0e93166 100755
-init_path=`readlink -f /sbin/init`
-if [ `basename $init_path` = "systemd" ]; then
+if command -v systemctl > /dev/null; then
systemctl --no-block start usb_modeswitch@$p2.service
systemctl --no-block restart usb_modeswitch@$p2.service
-elif [ -e "/etc/init/usb-modeswitch-upstart.conf" ]; then
+elif command -v initctl > /dev/null; then
initctl emit --no-wait usb-modeswitch-upstart UMS_PARAM=$p2
@@ -191,13 +177,25 @@ index eb3fa3e..0e93166 100755
+ exec $SBINDIR/usb_modeswitch_dispatcher --switch-mode $p2 &
fi
exit 0
diff --git a/usb_modeswitch.tcl b/usb_modeswitch.tcl
index d2ee50c..8a48751 100755
--- a/usb_modeswitch.tcl
+++ b/usb_modeswitch.tcl
Index: usb-modeswitch-2.6.0/usb_modeswitch@.service
===================================================================
--- usb-modeswitch-2.6.0.orig/usb_modeswitch@.service
+++ usb-modeswitch-2.6.0/usb_modeswitch@.service
@@ -3,6 +3,6 @@ Description=USB_ModeSwitch_%i
[Service]
Type=oneshot
-ExecStart=/usr/sbin/usb_modeswitch_dispatcher --switch-mode %i
+ExecStart=@sbindir@/usb_modeswitch_dispatcher --switch-mode %i
#ExecStart=/bin/echo %i
Index: usb-modeswitch-2.6.0/usb_modeswitch_dispatcher.tcl
===================================================================
--- usb-modeswitch-2.6.0.orig/usb_modeswitch_dispatcher.tcl
+++ usb-modeswitch-2.6.0/usb_modeswitch_dispatcher.tcl
@@ -12,6 +12,16 @@
# Part of usb-modeswitch-2.5.2 package
# (C) Josua Dietze 2009-2017
# Part of usb-modeswitch-2.6.0 package
# (C) Josua Dietze 2009-2019
+# Compile-time configuration, injected by the Makefile.
+set setup(sbindir) /usr/sbin
@@ -212,9 +210,9 @@ index d2ee50c..8a48751 100755
set arg0 [lindex $argv 0]
if [regexp {\.tcl$} $arg0] {
if [file exists $arg0] {
@@ -91,10 +101,8 @@ if {![regexp {(.*?):.*$} $arg1 d device]} {
@@ -115,10 +125,8 @@ if {![regexp {(.*?):.*$} $arg1 d device]
}
}
set flags(logwrite) 1
-set setup(dbdir) /usr/share/usb_modeswitch
-set setup(dbdir_etc) /etc/usb_modeswitch.d
@@ -224,7 +222,7 @@ index d2ee50c..8a48751 100755
SafeExit
}
@@ -261,7 +269,7 @@ if {$config(NoMBIMCheck)==0 && $usb(bNumConfigurations) > 1} {
@@ -285,7 +293,7 @@ if {$config(NoMBIMCheck)==0 && $usb(bNum
if [CheckMBIM] {
Log " driver for MBIM devices is available"
Log "Find MBIM configuration number ..."
@@ -233,7 +231,7 @@ index d2ee50c..8a48751 100755
Log "Error when trying to find MBIM configuration, switch to legacy modem mode"
} else {
set cfgno [string trim $cfgno]
@@ -297,7 +305,7 @@ if {$report == ""} {
@@ -321,7 +329,7 @@ if {$report == ""} {
# Now we are actually switching
if $flags(logging) {
Log "Command line:\nusb_modeswitch -W -D $configParam $busParam $devParam -v $usb(idVendor) -p $usb(idProduct) -f \$flags(config)"
@@ -242,7 +240,7 @@ index d2ee50c..8a48751 100755
Log "\nVerbose debug output of usb_modeswitch and libusb follows"
Log "(Note that some USB errors are to be expected in the process)"
Log "--------------------------------"
@@ -305,7 +313,7 @@ if {$report == ""} {
@@ -329,7 +337,7 @@ if {$report == ""} {
Log "--------------------------------"
Log "(end of usb_modeswitch output)\n"
} else {
@@ -251,19 +249,22 @@ index d2ee50c..8a48751 100755
}
}
@@ -498,9 +506,9 @@ return 1
@@ -522,12 +530,12 @@ return 1
proc {ParseGlobalConfig} {} {
proc {ParseGlobalConfig} {path} {
-global flags
+global flags setup
set configFile ""
-set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch]
+set places [list $setup(etcdir)/usb_modeswitch.conf $setup(etcdir)/sysconfig/usb_modeswitch $setup(etcdir)/default/usb_modeswitch]
if [string length $path] {
set places [list $path]
} else {
- set places [list /etc/usb_modeswitch.conf /etc/sysconfig/usb_modeswitch /etc/default/usb_modeswitch]
+ set places [list $setup(etcdir)/usb_modeswitch.conf $setup(etcdir)/sysconfig/usb_modeswitch $setup(etcdir)/default/usb_modeswitch]
}
foreach cfg $places {
if [file exists $cfg] {
set configFile $cfg
@@ -897,10 +905,12 @@ proc {SysLog} {msg} {
@@ -923,10 +931,12 @@ proc {SysLog} {msg} {
global flags
if {![info exists flags(logger)]} {
@@ -280,15 +281,3 @@ index d2ee50c..8a48751 100755
}
}
Log "Logger is $flags(logger)"
diff --git a/usb_modeswitch@.service b/usb_modeswitch@.service
index f74a8bf..90cb96a 100644
--- a/usb_modeswitch@.service
+++ b/usb_modeswitch@.service
@@ -3,6 +3,6 @@ Description=USB_ModeSwitch_%i
[Service]
Type=oneshot
-ExecStart=/usr/sbin/usb_modeswitch_dispatcher --switch-mode %i
+ExecStart=@sbindir@/usb_modeswitch_dispatcher --switch-mode %i
#ExecStart=/bin/echo %i

4
pkgs/development/tools/ocaml/dune/2.nix
View File

@@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
pname = "dune";
version = "2.1.2";
version = "2.1.3";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1bszrjxwm2pj0ga0s9krp75xdp2yk1qi6rw0315xq57cngmphclw";
sha256 = "1cxf7g2kld7jmk6m47fdvmfdyqy1di517qiph55jrq7sm5akp3hy";
};
buildInputs = [ ocaml findlib ];

14
pkgs/development/tools/ocaml/opam/default.nix
View File

@@ -31,8 +31,8 @@ let
sha256 = "19slqf5bdj0rrph2w41giwmn6df2qm07942jn058pjkjrnk30d4s";
};
mccs = fetchurl {
url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+10.tar.gz";
sha256 = "003kam22plnh88liyxi4d1065j2rys1mpdla20rxps53ah1xwmxg";
url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+11.tar.gz";
sha256 = "0mswapf37rav8nvvbjc4c7c7wnl6qwgd3c5v0nfifmr910qygz72";
};
ocamlgraph = fetchurl {
url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz";
@@ -55,13 +55,13 @@ let
sha256 = "02lb2d9i12bxrz2ba5wygk2bycan316skqlyri0597q7j9210g8r";
};
opam = fetchurl {
url = "https://github.com/ocaml/opam/archive/2.0.5.zip";
sha256 = "0arv5zaikvcqbicdk47jpfgvjrqhqm71yq2zmj7pp6zf7bm0js6s";
url = "https://github.com/ocaml/opam/archive/2.0.6.zip";
sha256 = "076070qwf7rqp5bh0mmgc5b3vyihgp4qpkd6fscxzya4in66bzf8";
};
};
in stdenv.mkDerivation {
pname = "opam";
version = "2.0.5";
version = "2.0.6";
buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@@ -112,9 +112,9 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A package manager for OCaml";
homepage = http://opam.ocamlpro.com/;
homepage = "https://opam.ocaml.org/";
maintainers = [ maintainers.henrytill ];
platforms = platforms.all;
};
}
# Generated by: ./opam.nix.pl -v 2.0.5 -p opam-shebangs.patch
# Generated by: ./opam.nix.pl -v 2.0.6 -p opam-shebangs.patch

6
pkgs/development/tools/ocaml/opam/opam.nix.pl
View File

@@ -64,8 +64,8 @@ print <<"EOF";
sha256 = "$OPAM_RELEASE_SHA256";
};
};
in stdenv.mkDerivation rec {
name = "opam-\${version}";
in stdenv.mkDerivation {
pname = "opam";
version = "$OPAM_RELEASE";
buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap;
@@ -122,7 +122,7 @@ print <<'EOF';
meta = with stdenv.lib; {
description = "A package manager for OCaml";
homepage = http://opam.ocamlpro.com/;
homepage = "https://opam.ocaml.org/";
maintainers = [ maintainers.henrytill ];
platforms = platforms.all;
};

4
pkgs/development/tools/rust/cargo-bloat/default.nix
View File

@@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-bloat";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "RazrFalcon";
repo = pname;
rev = "v${version}";
sha256 = "0wzsc8azxgvavsbsdpd1i6g8i4sp07wn9iayr8dp8072ig5c4fhy";
sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53";
};
cargoSha256 = "1jc1lx0yk8galkyc4a67d39ywsfrgc2sjjsz08p47gpz7228d64w";