diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 00682b13bef0..907ea3ed7caf 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl +, llvm, qt48Full, qrencode, libmicrohttpd_0_9_70, libjack2, alsaLib, faust, curl , bc, coreutils, which, libsndfile, pkg-config }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl + llvm qt48Full qrencode libmicrohttpd_0_9_70 libjack2 alsaLib faust curl bc coreutils which libsndfile pkg-config ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index b4e4044bea6a..524835402f4e 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.5.2"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "0z32x0297g078jk3jhzb4vrf8jhw0qprvqzm9p097h8x0026w42l"; + sha256 = "1j5m9mhjzp2r4wdwnnnckms8ic536s6y0iyry2zdndbsy215hqlz"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 9fb251d52957..9af12b386a0b 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.5.2"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1qxvsz19iv5fr0nvz75b13knmsbkhkgvlvrhip8y4j66ypscs652"; + sha256 = "1bm6jk7gkl4vi579x99mja4znrzzp15zk66ss600dn8aq11jrxv2"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index e07e7300048a..d8f41664e665 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "kdevelop"; - version = "5.5.2"; + version = "5.6.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "1nkl3z1n1l7ly2zvmbx2sdhx5q72wcvpwhzsz3qgw1474qd9i3i2"; + sha256 = "0cpmavxz5fi0f1rjinvn6id1nplvjwg00l0n36s0ybygqkacgb9q"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index b6f05ea3094a..cb4233be8ec3 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -1,5 +1,5 @@ { stdenv, stdenvGcc6, lib -, fetchFromGitHub, cmake, libmicrohttpd, openssl +, fetchFromGitHub, cmake, libmicrohttpd_0_9_70, openssl , opencl-headers, ocl-icd, hwloc, cudatoolkit , devDonationLevel ? "0.0" , cudaSupport ? false @@ -27,7 +27,7 @@ stdenv'.mkDerivation rec { ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd openssl hwloc ] + buildInputs = [ libmicrohttpd_0_9_70 openssl hwloc ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index c7f449d97cdb..e3d22b5d00a6 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -13,9 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj openjpeg libpng ]; - cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ]; + cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-2.3" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; - postInstall = '' + postInstall = if stdenv.isDarwin then '' + mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" + cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" + mv $out/XyGrib/XyGrib.app $out/Applications + wrapQtApp "$out/Applications/XyGrib.app/Contents/MacOS/XyGrib" + '' else '' wrapQtApp $out/XyGrib/XyGrib mkdir -p $out/bin ln -s $out/XyGrib/XyGrib $out/bin/xygrib @@ -29,6 +35,6 @@ stdenv.mkDerivation rec { of global and large area atmospheric and wave models.''; license = licenses.gpl3; platforms = platforms.all; - maintainers = [ maintainers.j03 ]; + maintainers = with maintainers; [ j03 SuperSandro2000 ]; }; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 8b1dda5ebc86..34b37926ea6f 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.12"; + version = "1.14.13"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0wdr85l3rr6w50dmlbsib895gs9cc19z5piblp0v9slrsxx4nkxk"; + sha256 = "0xxins5crcgghgvnzplmp0qyv2gbmh36v1fpl15d03jwdd6287ds"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 5dd55dee95a2..b0803b6c7a7d 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.5"; + version = "1.15.6"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1wc43h3pmi92r6ypmh58vq13vm44rl1di09assz3xdwlry86n1y1"; + sha256 = "05sqcx4fm1nxfm46j6xriq0fnnah4bm8bqw027xrzcg2qmrvl2w9"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index efea9d0eb826..75667a6cb2b5 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -9,12 +9,12 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.4-bootstrap-20161024"; - revision = "79d85a4965ea7c46db483314c3981751909d7883"; + version = "1.4-bootstrap-${builtins.substring 0 7 revision}"; + revision = "bdd4b9503e47c2c38a9d0a9bb2f5d95ec5ff8ef6"; src = fetchurl { url = "https://github.com/golang/go/archive/${revision}.tar.gz"; - sha256 = "1ljbllwjysya323xxm9s792z8y9jdw19n8sj3mlc8picjclrx5xf"; + sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5"; }; nativeBuildInputs = [ pkgconfig ]; @@ -43,22 +43,6 @@ stdenv.mkDerivation rec { cd go patchShebangs ./ # replace /bin/bash - # Disable timezone tests (these fail when `tzdata` is updated) - rm src/time/{example,format}_test.go - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{multicast_test.go,parse_test.go,port_test.go} - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable network timeout test - sed -i '/TestDialTimeout/areturn' src/net/dial_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' # prepend the nix path to the zoneinfo files but also leave the original value for static binaries @@ -70,55 +54,10 @@ stdenv.mkDerivation rec { # Replace references to the loader find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; - '' + lib.optionalString stdenv.isDarwin '' - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestDialDualStackLocalhost/areturn' src/net/dial_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - # fails when running inside tmux - sed -i '/TestNohup/areturn' src/os/signal/signal_test.go - - # unix socket tests fail on darwin - sed -i '/TestConnAndListener/areturn' src/net/conn_test.go - sed -i '/TestPacketConn/areturn' src/net/conn_test.go - sed -i '/TestPacketConn/areturn' src/net/packetconn_test.go - sed -i '/TestConnAndPacketConn/areturn' src/net/packetconn_test.go - sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/packetconn_test.go - sed -i '/TestUnixConnSpecificMethods/areturn' src/net/packetconn_test.go - sed -i '/TestUnixListenerSpecificMethods/areturn' src/net/protoconn_test.go - sed -i '/TestUnixConnSpecificMethods/areturn' src/net/protoconn_test.go - sed -i '/TestStreamConnServer/areturn' src/net/server_test.go - sed -i '/TestReadUnixgramWithUnnamedSocket/areturn' src/net/unix_test.go - sed -i '/TestReadUnixgramWithZeroBytesBuffer/areturn' src/net/unix_test.go - sed -i '/TestUnixgramWrite/areturn' src/net/unix_test.go - sed -i '/TestUnixConnLocalAndRemoteNames/areturn' src/net/unix_test.go - sed -i '/TestUnixgramConnLocalAndRemoteNames/areturn' src/net/unix_test.go - sed -i '/TestWithSimulated/areturn' src/log/syslog/syslog_test.go - sed -i '/TestFlap/areturn' src/log/syslog/syslog_test.go - sed -i '/TestNew/areturn' src/log/syslog/syslog_test.go - sed -i '/TestNewLogger/areturn' src/log/syslog/syslog_test.go - sed -i '/TestDial/areturn' src/log/syslog/syslog_test.go - sed -i '/TestWrite/areturn' src/log/syslog/syslog_test.go - sed -i '/TestConcurrentWrite/areturn' src/log/syslog/syslog_test.go - sed -i '/TestConcurrentReconnect/areturn' src/log/syslog/syslog_test.go - - # remove IP resolving tests, on darwin they can find fe80::1%lo while expecting ::1 - sed -i '/TestResolveIPAddr/areturn' src/net/ipraw_test.go - sed -i '/TestResolveTCPAddr/areturn' src/net/tcp_test.go - sed -i '/TestResolveUDPAddr/areturn' src/net/udp_test.go - - sed -i '/TestCgoExternalThreadSIGPROF/areturn' src/runtime/crash_cgo_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd ''; patches = [ ./remove-tools-1.4.patch - ./creds-test-1.4.patch ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/creds-test-1.4.patch b/pkgs/development/compilers/go/creds-test-1.4.patch deleted file mode 100644 index 98cec532dcca..000000000000 --- a/pkgs/development/compilers/go/creds-test-1.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/go-go1.4.3/src/syscall/creds_test.go b/go-go1.4.3/src/syscall/creds_test.go -index b1894c6..b2d6b4e 100644 ---- a/src/syscall/creds_test.go -+++ b/src/syscall/creds_test.go -@@ -56,9 +56,10 @@ func TestSCMCredentials(t *testing.T) { - ucred.Gid = 0 - oob := syscall.UnixCredentials(&ucred) - _, _, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil) -- if err.(*net.OpError).Err != syscall.EPERM { -- t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err) -+ if err.(*net.OpError).Err != syscall.EPERM && err.(*net.OpError).Err != syscall.EINVAL { -+ t.Fatalf("WriteMsgUnix failed with %v, want EPERM or EINVAL", err) - } -+ - } - - ucred.Pid = int32(os.Getpid()) diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index cfef09c480a2..b7afe5ed03af 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,15 +2,21 @@ stdenv.mkDerivation rec { pname = "libconfuse"; - version = "3.2.2"; + version = "3.3"; src = fetchFromGitHub { - sha256 = "0djjq7j9iiyqxqqrlzm476xkibjasqvgzjwkalgj1l3f2smi53aw"; + sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; }; + postPatch = '' + substituteInPlace tests/Makefile.am \ + --replace 'TESTS += empty_string' "" \ + --replace 'TESTS += print_filter' "" + ''; + nativeBuildInputs = [ autoreconfHook flex ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.70.nix b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix new file mode 100644 index 000000000000..1cd04b0b2777 --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/0.9.70.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.70"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "01vkjy89b1ylmh22dy5yza2r414nfwcfixxh3v29nvzrjv9s7l4h"; + }; +}) diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix new file mode 100644 index 000000000000..74bd6cce42c4 --- /dev/null +++ b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix @@ -0,0 +1,10 @@ +{ stdenv, callPackage, fetchurl }: + +callPackage ./generic.nix ( rec { + version = "0.9.71"; + + src = fetchurl { + url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; + sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; + }; +}) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix similarity index 76% rename from pkgs/development/libraries/libmicrohttpd/default.nix rename to pkgs/development/libraries/libmicrohttpd/generic.nix index 4a7a228150ce..9b817f21b94c 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/generic.nix @@ -1,13 +1,8 @@ -{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl }: +{ stdenv, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintl, version, src }: stdenv.mkDerivation rec { pname = "libmicrohttpd"; - version = "0.9.71"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/${pname}-${version}.tar.gz"; - sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78"; - }; + inherit version src; outputs = [ "out" "dev" "devdoc" "info" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix index ecccba3938a0..e6202441da64 100644 --- a/pkgs/development/python-modules/linuxfd/default.nix +++ b/pkgs/development/python-modules/linuxfd/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "linuxfd"; - version = "1.4.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "b8bf6847b5c8e50e0842024d2911bfc1048db9abf37582a310cd57070971d692"; + sha256 = "b8c00109724b68e093f9b556edd78e41ed65fb8d969fd0e83186a97b5d3139b4"; }; # no tests diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 6fc9f24a63a7..e7b61b70fa33 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.12.1"; + version = "0.12.2"; src = fetchPypi { inherit pname version; - sha256 = "f4a048e329766a6023768c9fefd77c859a9726bdf2029c62ec78de410ec876cd"; + sha256 = "a4e8d8c528b0386340fc59ba98118a2aeb668a3741288b7ac15fd35124a91813"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 123c9ca4df6c..cf8c95130026 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.13"; + version = "2.4.14"; src = fetchPypi { inherit pname version; - sha256 = "c09e285d049590fd76ef72bc19b4597bef80712e942b3a507ef1521b432d84cd"; + sha256 = "3bc3709c735ebb3f98f19e96c8887868f4671077d4808076cfc5445912633881"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index ff3f3335c87c..5eb8b99ea096 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -254,6 +254,15 @@ in buildPythonPackage rec { cp -r $out/${python.sitePackages}/torch/include $dev/include cp -r $out/${python.sitePackages}/torch/share $dev/share + # Fix up library paths for split outputs + substituteInPlace \ + $dev/share/cmake/Torch/TorchConfig.cmake \ + --replace \''${TORCH_INSTALL_PREFIX}/lib "$lib/lib" + + substituteInPlace \ + $dev/share/cmake/Caffe2/Caffe2Targets-release.cmake \ + --replace \''${_IMPORT_PREFIX}/lib "$lib/lib" + mkdir $lib cp -r $out/${python.sitePackages}/torch/lib $lib/lib ''; diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 74dc6c79a746..781604fb9b0f 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,12 +25,12 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.8.0"; + version = "5.8.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ae9baf7a83a3249686703eee71e81a0283570f545ce985a999fd74b6ab3d4e4f"; + sha256 = "9c1afca73b13ede07680015d69f611c7dec33b8c22565de70f0cbbf0464b8db7"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 8521da73e936..55511be4926c 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildPythonPackage , fetchFromGitHub , click @@ -40,13 +40,16 @@ buildPythonPackage rec { ''; checkInputs = [ pytest requests ]; + + doCheck = !stdenv.isDarwin; + # watchgod required the watchgod package, which isn't available in nixpkgs checkPhase = '' pytest --ignore=tests/supervisors/test_watchgodreload.py \ -k 'not test_supported_upgrade_request and not test_invalid_upgrade[WSProtocol]' ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://www.uvicorn.org/"; description = "The lightning-fast ASGI server"; license = licenses.bsd3; diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 721efb313ebe..90bf2c3a57f6 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd }: +{ stdenv, lib, fetchgit, pkgconfig, git, libmicrohttpd_0_9_70 }: stdenv.mkDerivation rec { pname = "fileshare"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig git ]; - buildInputs = [ libmicrohttpd ]; + buildInputs = [ libmicrohttpd_0_9_70 ]; makeFlags = [ "BUILD=release" ]; diff --git a/pkgs/tools/misc/wsl-open/default.nix b/pkgs/tools/misc/wsl-open/default.nix new file mode 100644 index 000000000000..ddd3904a1057 --- /dev/null +++ b/pkgs/tools/misc/wsl-open/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "wsl-open"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "4U6U57"; + repo = "wsl-open"; + rev = "v${version}"; + sha256 = "1mwak846zh47p3pp4q5f54cw8d9qk61zn43q81j2pkcm35mv9lzg"; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + install -m0755 -D wsl-open.sh $out/bin/wsl-open + installManPage wsl-open.1 + ''; + + meta = with stdenv.lib; { + description = "Open files with xdg-open from Windows Subsystem for Linux (WSL) in Windows applications"; + homepage = "https://gitlab.com/4U6U57/wsl-open"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index 4371d37391be..5c209393978f 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -2,11 +2,11 @@ let wrapper = stdenv.mkDerivation rec { pname = "wrapper"; - version = "3.5.43"; + version = "3.5.44"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "19cx3854rk7b2056z8pvxnf4simsg5js7czsy2bys7jl6vh2x02b"; + sha256 = "1iq4j7srzy5p8q3nci9316bnwx4g71jyvzd1i5hp3s8v1k61910g"; }; buildInputs = [ jdk ]; @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { pname = "i2p"; - version = "0.9.47"; + version = "0.9.48"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "0krcdm73qing7z918wpml9sk6dn0284wps2ghkmlrdaklfkavk6v"; + sha256 = "0cnm4bwl1gqcx89i96j2qlq6adphy4l72h5whamqwv86n8bmpig8"; }; buildInputs = [ jdk ant gettext which ]; diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index 7d4ea120a8e6..5078adbf3b7b 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper +{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper, jq }: stdenv.mkDerivation rec { pname = "rofi-systemd"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "rofi-systemd"; rev = "v${version}"; - sha256 = "1dbygq3qaj1f73hh3njdnmibq7vi6zbyzdc6c0j989c0r1ksv0zi"; + sha256 = "0lgffb6rk1kf91j4j303lzpx8w2g9zy2gk99p8g8pk62a30c5asm"; }; buildInputs = [ makeWrapper ]; @@ -22,11 +22,12 @@ stdenv.mkDerivation rec { ''; wrapperPath = with stdenv.lib; makeBinPath [ - rofi coreutils - util-linux gawk + jq + rofi systemd + util-linux ]; fixupPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6543872561c..1e1f8d48d4ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3620,6 +3620,8 @@ in wshowkeys = callPackage ../tools/wayland/wshowkeys { }; + wsl-open = callPackage ../tools/misc/wsl-open { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; xob = callPackage ../tools/X11/xob { }; @@ -14362,7 +14364,9 @@ in libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; + libmicrohttpd_0_9_70 = callPackage ../development/libraries/libmicrohttpd/0.9.70.nix { }; + libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { }; + libmicrohttpd = libmicrohttpd_0_9_71; libmikmod = callPackage ../development/libraries/libmikmod { inherit (darwin.apple_sdk.frameworks) CoreAudio;