diff options
Diffstat (limited to 'pkgs/development')
55 files changed, 1219 insertions, 500 deletions
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 0d5a892e2e9..14a7f2dc4e2 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, coq }: -let params = - let v_8_8_0 = { - rev = "V8.8.0"; - sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; +let params = { + "8.6" = { + rev = "v8.6.0"; + sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; + }; + "8.7" = { + rev = "V8.7.0"; + sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; + }; + "8.8" = { + rev = "V8.8.0"; + sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + }; + "8.9" = { + rev = "V8.9.0"; + sha256 = "03qz1w2xb2j5p06liz5yyafl0fl9vprcqm6j0iwi7rxwghl00p01"; + }; }; - in - { - "8.6" = { - rev = "v8.6.0"; - sha256 = "0553pcsy21cyhmns6k9qggzb67az8kl31d0lwlnz08bsqswigzrj"; - }; - "8.7" = { - rev = "V8.7.0"; - sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; - }; - "8.8" = v_8_8_0; - "8.9" = v_8_8_0; - }; - param = params."${coq.coq-version}" -; in + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 86e5687321b..b31fcde1b80 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -15,15 +15,15 @@ let }; "8.8" = { - version = "1.0"; - rev = "v1.0-8.8"; - sha256 = "0dd7zd5j2sv5cw3mfwg33ss2vcj634q3qykakc41sv7f3rfgqfnn"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.8"; + sha256 = "1v9asdlhhks25ngnjn4dafx7nrcc5p0lhriqckh3y79nxbgpq4lx"; }; "8.9" = { - version = "1.2beta"; - rev = "v1.2-beta-8.9"; - sha256 = "1sj7vyarmvp1w5kvbhgpgap1yd0yrj4n1jrla0wv70k0jrq5hhpz"; + version = "1.2beta2"; + rev = "v1.2-beta2-8.9"; + sha256 = "0y2zwv7jxs1crprj5qvg46h0v9wyfn99ln40yskq91y9h1lj5h3j"; }; }; param = params."${coq.coq-version}"; diff --git a/pkgs/development/coq-modules/ltac2/default.nix b/pkgs/development/coq-modules/ltac2/default.nix new file mode 100644 index 00000000000..30917fcb78f --- /dev/null +++ b/pkgs/development/coq-modules/ltac2/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, which, coq }: + +let params = { + "8.7" = { + version = "0.1"; + rev = "v0.1-8.7"; + sha256 = "0l6wiwi4cvd0i324fb29i9mdh0ijlxzggw4mrjjy695l2qdnlgg0"; + }; + "8.8" = { + version = "0.1"; + rev = "0.1"; + sha256 = "1zz26cyv99whj7rrpgnhhm9dfqnpmrx5pqizn8ihf8jkq8d4drz7"; + }; + "8.9" = { + version = "0.1"; + rev = "a69551a49543b22a7d4e6a2484356b56bd05068e"; + sha256 = "0xby1kb26r9gcvk5511wqj05fqm9paynwfxlfqkmwkgnfmzk0x73"; + }; +}; + param = params."${coq.coq-version}"; +in + +stdenv.mkDerivation rec { + inherit (param) version; + name = "coq${coq.coq-version}-ltac2-${version}"; + + src = fetchFromGitHub { + owner = "coq"; + repo = "ltac2"; + inherit (param) rev sha256; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]); + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = { + description = "A robust and expressive tactic language for Coq"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.lgpl21; + inherit (coq.meta) platforms; + inherit (src.meta) homepage; + }; + + passthru = { + compatibleCoqVersions = stdenv.lib.flip builtins.hasAttr params; + }; +} diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 08ef667b24e..b8de133f502 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -20,6 +20,7 @@ let # docs install -dm755 "$out/share/doc" install -m644 ${readmeFile} $out/share/doc/${name}.txt + runHook postInstall ''; } // args); @@ -107,7 +108,7 @@ let }; mkDictFromDicollecte = - { shortName, shortDescription, longDescription, dictFileName }: + { shortName, shortDescription, longDescription, dictFileName, isDefault ? false }: mkDict rec { inherit dictFileName; version = "5.3"; @@ -131,6 +132,12 @@ let unpackCmd = '' unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} ''; + postInstall = stdenv.lib.optionalString isDefault '' + for ext in aff dic; do + ln -sv $out/share/hunspell/${dictFileName}.$ext $out/share/hunspell/fr_FR.$ext + ln -sv $out/share/myspell/dicts/${dictFileName}.$ext $out/share/myspell/dicts/fr_FR.$ext + done + ''; }; mkDictFromWordlist = @@ -483,6 +490,7 @@ in { réformées, suivant la lente évolution de l’orthographe actuelle. Ce dictionnaire contient les graphies les moins polémiques de la réforme. ''; + isDefault = true; }; fr-reforme1990 = mkDictFromDicollecte { diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 07df956e7a4..afab8a4e9a4 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.56/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.58/ ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 09556297da2..17473db9eeb 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,635 +3,635 @@ { attica = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/attica-5.57.0.tar.xz"; - sha256 = "a13682bccaca3529df6e3b54e1d4e48fb3d1654fe1b142701e73ce9fe0b87655"; - name = "attica-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/attica-5.58.0.tar.xz"; + sha256 = "edba3f94705f904edb0bddd5bab491575bb15ee8f278b92b41272d6f566cad2a"; + name = "attica-5.58.0.tar.xz"; }; }; baloo = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/baloo-5.57.0.tar.xz"; - sha256 = "32ab4ed2d295fe734a4a475403dea72e2feef27f662ae64c841c410eb7bb3dd3"; - name = "baloo-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/baloo-5.58.0.tar.xz"; + sha256 = "a1e9340f1046f2df1568da6cd07b26bac9361725cd32b46fd69c370aab0c7227"; + name = "baloo-5.58.0.tar.xz"; }; }; bluez-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/bluez-qt-5.57.0.tar.xz"; - sha256 = "43e1be1882832cef88186255a6b692d9fd1366bad09db0c2075a126b0fc0df65"; - name = "bluez-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/bluez-qt-5.58.0.tar.xz"; + sha256 = "530dc2f89ca26cda23a6383ccfdb00584083d2fbee3b437e5337a77f51513da0"; + name = "bluez-qt-5.58.0.tar.xz"; }; }; breeze-icons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/breeze-icons-5.57.0.tar.xz"; - sha256 = "c3ba92acb5bfcff66f41232ebc6e8c893dab78ac59a713fa4bfa2a0e097f4ed2"; - name = "breeze-icons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/breeze-icons-5.58.0.tar.xz"; + sha256 = "536d2790a143bf0d8cc9ee4de74dea0924eb7d3ac4888fece7bf7c7038066491"; + name = "breeze-icons-5.58.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/extra-cmake-modules-5.57.0.tar.xz"; - sha256 = "aa53f8953792b452672f275c2ea9b96ab2adf3e13d9645c3451b06dbc8055b18"; - name = "extra-cmake-modules-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/extra-cmake-modules-5.58.0.tar.xz"; + sha256 = "514011c12eeb2ac99d3118975832a279af2c2eea5e8b36b49c81962930b2ecc7"; + name = "extra-cmake-modules-5.58.0.tar.xz"; }; }; frameworkintegration = { - version = "5.57.0"; + version = "5.58.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/frameworkintegration-5.57.0.tar.xz"; - sha256 = "9c5850c1d41900bcb81e7929d54856d0cdd2565a276e5e262f624eb1217cbb78"; - name = "frameworkintegration-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/frameworkintegration-5.58.1.tar.xz"; + sha256 = "30a9e6c4bde295a031f94ea622ce2324b8a98536f51f0a008b148ea11c44a274"; + name = "frameworkintegration-5.58.1.tar.xz"; }; }; kactivities = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kactivities-5.57.0.tar.xz"; - sha256 = "442527db8710b9045dc574816bc9c32cad5f8a404e681fb030d7e9c2f3d77761"; - name = "kactivities-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kactivities-5.58.0.tar.xz"; + sha256 = "5295cfdc392a8146ca9c3822f1250ceaf5b54990d69c2e3dec4b072519a5ce5b"; + name = "kactivities-5.58.0.tar.xz"; }; }; kactivities-stats = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kactivities-stats-5.57.0.tar.xz"; - sha256 = "4c7a49905ec1b6e03831986b254d0fd091e44fe920fffa123c969765c6474ba3"; - name = "kactivities-stats-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kactivities-stats-5.58.0.tar.xz"; + sha256 = "5f3bde50ffe0c23ad5f28c7327d375f223535f139ff014c5d53aef2f41e80611"; + name = "kactivities-stats-5.58.0.tar.xz"; }; }; kapidox = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kapidox-5.57.0.tar.xz"; - sha256 = "16f53e4722adddaa8729b4cccc374d16bdbfdd987f8655d2b431a91b046fe2b2"; - name = "kapidox-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kapidox-5.58.0.tar.xz"; + sha256 = "8635b09f7d0daa8554f228d471bbb1147cf412b779e3a8ab7c2bf7c24ec85165"; + name = "kapidox-5.58.0.tar.xz"; }; }; karchive = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/karchive-5.57.0.tar.xz"; - sha256 = "e0e64e7e88c8df96f894de20aff4d12925e0d362c5134df83473ea48c0432783"; - name = "karchive-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/karchive-5.58.0.tar.xz"; + sha256 = "cd5a42101e5cc50f026f48002dc8125e0c898b148fea5fba4451023ec1e181ad"; + name = "karchive-5.58.0.tar.xz"; }; }; kauth = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kauth-5.57.0.tar.xz"; - sha256 = "9d6b9135cc47710b28e2a7731c4c5c1f6dba2b0e5fe982b9d2a82a11d7d497c2"; - name = "kauth-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kauth-5.58.0.tar.xz"; + sha256 = "8c004199f1e7aa14f9244299bb8b288f6d077e5c2557f089a530d0c1cd072f4f"; + name = "kauth-5.58.0.tar.xz"; }; }; kbookmarks = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kbookmarks-5.57.0.tar.xz"; - sha256 = "bf57f111e176ab2ecb79646b1f93cf5d84a8d3fcfb13b805b5140e75b42eb085"; - name = "kbookmarks-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kbookmarks-5.58.0.tar.xz"; + sha256 = "9b34f49703101e4d9f6338b66edded7b2c1b7826938a81025ede85a7edc71b02"; + name = "kbookmarks-5.58.0.tar.xz"; }; }; kcmutils = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcmutils-5.57.0.tar.xz"; - sha256 = "f3ee63a356e18be95a15141346356f3f43bb067d0326021d99f4b73ee4716fbb"; - name = "kcmutils-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcmutils-5.58.0.tar.xz"; + sha256 = "2eec73ffca93eb5fc9975a96e072c565a4907b05c161f49877684f4ab252fd9d"; + name = "kcmutils-5.58.0.tar.xz"; }; }; kcodecs = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcodecs-5.57.0.tar.xz"; - sha256 = "c98b98cf7258c03fa5131a987e278f348d52f792dcb9f2a5664fe35aadea6995"; - name = "kcodecs-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcodecs-5.58.0.tar.xz"; + sha256 = "6e5b3c2083c840947e255d58b338128a5e498a4176969f6ac724d56ca3cae8ef"; + name = "kcodecs-5.58.0.tar.xz"; }; }; kcompletion = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcompletion-5.57.0.tar.xz"; - sha256 = "5ad8746a57cef2b12da5a97e296cbb0b708e8ecfb4253786a899fa86951395ec"; - name = "kcompletion-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcompletion-5.58.0.tar.xz"; + sha256 = "4f5be9d3a70183e0580126c6395d34e3e4141d6e6f852f5f0bb578b20205f5dd"; + name = "kcompletion-5.58.0.tar.xz"; }; }; kconfig = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kconfig-5.57.0.tar.xz"; - sha256 = "155b0dbba8772aa8ea3e75217029daa00ada8699e5a807154214f66b2462c010"; - name = "kconfig-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kconfig-5.58.0.tar.xz"; + sha256 = "6f464a63079f43f11deb7f1661dadaa12539b8a8c75e3fa7476dae8ab6886a5e"; + name = "kconfig-5.58.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kconfigwidgets-5.57.0.tar.xz"; - sha256 = "771c5641a9ae465feaf00ffbb3f3c0433ad8d4a90355dc50d5b6b1b472912eb0"; - name = "kconfigwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kconfigwidgets-5.58.0.tar.xz"; + sha256 = "8d68cf5618b7123a39e62a8ee52a01af7f95325b1d7b7bcac097c0d723c054c0"; + name = "kconfigwidgets-5.58.0.tar.xz"; }; }; kcoreaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcoreaddons-5.57.0.tar.xz"; - sha256 = "7c2573de9b745e55fe61cff26941839cff0d2e40b6c5d791c24c9d6cc8cf7485"; - name = "kcoreaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcoreaddons-5.58.0.tar.xz"; + sha256 = "f01f3d8b8086085e034a530821a929e56943e33002091d29ab45e0772b6f8e5e"; + name = "kcoreaddons-5.58.0.tar.xz"; }; }; kcrash = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kcrash-5.57.0.tar.xz"; - sha256 = "4b12719a20f2ff0fe0a2656609d0aa277245cd2a9f764a7b6cfaa6da9d928dc0"; - name = "kcrash-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kcrash-5.58.0.tar.xz"; + sha256 = "cf921f0ced115107a57a4f15e95ea2d0478b56baf23102abc2470ecd6b8e3c44"; + name = "kcrash-5.58.0.tar.xz"; }; }; kdbusaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdbusaddons-5.57.0.tar.xz"; - sha256 = "86946d97e74420637f59ea0fff93e303bcbdc5b1d5e1c6361e2d9a3ceb0e1259"; - name = "kdbusaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdbusaddons-5.58.0.tar.xz"; + sha256 = "42f176b737f81e120d2fa78c20891b3b7e3f182c6e144ec9c99935a32d63f9b1"; + name = "kdbusaddons-5.58.0.tar.xz"; }; }; kdeclarative = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdeclarative-5.57.0.tar.xz"; - sha256 = "5335b39ac1cca34209c0420dab867b67ddb0e9ee483bdd6d4192269a1d5f654f"; - name = "kdeclarative-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdeclarative-5.58.0.tar.xz"; + sha256 = "267d1dbe55ca65c74289e56200b51de95bcbc231b2d4a2867cb6735d04783bec"; + name = "kdeclarative-5.58.0.tar.xz"; }; }; kded = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kded-5.57.0.tar.xz"; - sha256 = "04327dda12fa547bebb8e1b1bc26373e8f4174007dd629231403d59ce004201f"; - name = "kded-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kded-5.58.0.tar.xz"; + sha256 = "c8ca04174ff9997ccedb382fce7bc4573670ac5dabc69c0d6594589098ab6dc1"; + name = "kded-5.58.0.tar.xz"; }; }; kdelibs4support = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kdelibs4support-5.57.0.tar.xz"; - sha256 = "e9d1c06191031b482ea01d891756d125ff32927239c36a3011fc7b8f17aca1b0"; - name = "kdelibs4support-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kdelibs4support-5.58.0.tar.xz"; + sha256 = "c86db5d334c022d804cd9473f893b462904e336aad1ce2c350a1c87039d9473a"; + name = "kdelibs4support-5.58.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdesignerplugin-5.57.0.tar.xz"; - sha256 = "9e85a4ac798122b459722773a6e81f639be6dfe9c9714a16704f555c88334393"; - name = "kdesignerplugin-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdesignerplugin-5.58.0.tar.xz"; + sha256 = "c80a88a525c25fb699412e5c4a4a142ae388ab056aa826a9f5433e78da9c6e6b"; + name = "kdesignerplugin-5.58.0.tar.xz"; }; }; kdesu = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdesu-5.57.0.tar.xz"; - sha256 = "76d98db52f7f375991cd7ccbbf1dc100716f99a5792b71ef31a75cc33cf45b19"; - name = "kdesu-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdesu-5.58.0.tar.xz"; + sha256 = "9121dd13a37e0fe5d5d42bbc164d4e20228f85a9ed745829393d3292f7c8183b"; + name = "kdesu-5.58.0.tar.xz"; }; }; kdewebkit = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdewebkit-5.57.0.tar.xz"; - sha256 = "809e9df4ac3ca8b59799c8781694092cb1793f03af0b87a347a1c6019f96a592"; - name = "kdewebkit-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdewebkit-5.58.0.tar.xz"; + sha256 = "9f0629902e60717ee455f0a3e1201c735794f9c60e2fb6ec55b5983f532a2cbc"; + name = "kdewebkit-5.58.0.tar.xz"; }; }; kdnssd = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdnssd-5.57.0.tar.xz"; - sha256 = "5a61b942fd14c9d96370e19fd7a29594bfcbd3074e12625caac083206fce2789"; - name = "kdnssd-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdnssd-5.58.0.tar.xz"; + sha256 = "d3b6ee64f4ed491120351732abf99712e64d43deb1b796d4b701e28df9efad05"; + name = "kdnssd-5.58.0.tar.xz"; }; }; kdoctools = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kdoctools-5.57.0.tar.xz"; - sha256 = "649dbaff4f1559302e7da07f423a0bc9e3faa1c7a93dfeb170e50bf452d8def2"; - name = "kdoctools-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kdoctools-5.58.0.tar.xz"; + sha256 = "5c0b915d0f054098b47c5c1ef6ee0d174a9a607405f23c3921276189cefd48f4"; + name = "kdoctools-5.58.0.tar.xz"; }; }; kemoticons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kemoticons-5.57.0.tar.xz"; - sha256 = "c07b69c9275c117507166622e185c2bf0f36e1e4e8ad7b25fa3e1d793da4711b"; - name = "kemoticons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kemoticons-5.58.0.tar.xz"; + sha256 = "a34159566511f4c012186c52ae203c033d0cb81eef349fd89dbdc225f89b98bd"; + name = "kemoticons-5.58.0.tar.xz"; }; }; kfilemetadata = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kfilemetadata-5.57.0.tar.xz"; - sha256 = "49e6c281fdffd4f5fe363c6cefdb6c3022ef57c935d7d6b135607cdde9b2d116"; - name = "kfilemetadata-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kfilemetadata-5.58.0.tar.xz"; + sha256 = "76665ba8ba6ab90cc0e8d682a5c5421fde7c436f5521c614d0b63c5277fabf9c"; + name = "kfilemetadata-5.58.0.tar.xz"; }; }; kglobalaccel = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kglobalaccel-5.57.0.tar.xz"; - sha256 = "46370dcd4f110e6ccde3b3bf9c075deb1f22ad54016137925e4aea97b03cc2fe"; - name = "kglobalaccel-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kglobalaccel-5.58.0.tar.xz"; + sha256 = "4fd49052697d4659f793b8f7d678a9333a850ed6cf17472eaba9c023430b5bbf"; + name = "kglobalaccel-5.58.0.tar.xz"; }; }; kguiaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kguiaddons-5.57.0.tar.xz"; - sha256 = "744eb0ec35c936c17c3d11a08d19014e2166c4a307370207e0f5a38f01a91ebd"; - name = "kguiaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kguiaddons-5.58.0.tar.xz"; + sha256 = "d6d5884f31072fe93804ecad72c8f612fa03d6841318211ad8f6ebf1f5f020f3"; + name = "kguiaddons-5.58.0.tar.xz"; }; }; kholidays = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kholidays-5.57.0.tar.xz"; - sha256 = "f7db45906623c33dfbb297810082f8ff30c949e6a7d477f3b72de0521b0c9452"; - name = "kholidays-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kholidays-5.58.0.tar.xz"; + sha256 = "ec05faf5290a83d2450be6e1a68c086e4d2da934b3aaf61d578e3cda72295eef"; + name = "kholidays-5.58.0.tar.xz"; }; }; khtml = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/khtml-5.57.0.tar.xz"; - sha256 = "63d22fbc8cad3075a0b7ef195291c4b79ebc65da5de81b4885cac1063d783da3"; - name = "khtml-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/khtml-5.58.0.tar.xz"; + sha256 = "f75635e4d0ad9816953bbd0f8c18aea7cd470dc130a6294fa1d32c37bd66dcff"; + name = "khtml-5.58.0.tar.xz"; }; }; ki18n = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ki18n-5.57.0.tar.xz"; - sha256 = "bbd60981c9a0c1f9d9a52c8dd86adef7c4c30caf603f806d8730febaa36f0dd9"; - name = "ki18n-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ki18n-5.58.0.tar.xz"; + sha256 = "ea0181b15ff47b34ae7dd7a3a419c461cf05554f9014886d8b8b2ab2ec243977"; + name = "ki18n-5.58.0.tar.xz"; }; }; kiconthemes = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kiconthemes-5.57.0.tar.xz"; - sha256 = "09abb03a97027948a1116bfb2ca9842d3f8fb2def83b0b02aaed194dd5bd16f3"; - name = "kiconthemes-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kiconthemes-5.58.0.tar.xz"; + sha256 = "ec12602159b7115c91b30373321ab631f75b12f814769166b4ee2e3abd83c480"; + name = "kiconthemes-5.58.0.tar.xz"; }; }; kidletime = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kidletime-5.57.0.tar.xz"; - sha256 = "e99a07f814573526ed5141fc9e4bc2df12298df53a0d2787c3b7a4c3af915665"; - name = "kidletime-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kidletime-5.58.0.tar.xz"; + sha256 = "86d8c4ff13b864c07f98d0475683838708c43e4ba6275e05f21766e2a79cfd90"; + name = "kidletime-5.58.0.tar.xz"; }; }; kimageformats = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kimageformats-5.57.0.tar.xz"; - sha256 = "d7ce6c4737ae2846f015633e7479b60460d960a3a578777c2a884d499bd6cc14"; - name = "kimageformats-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kimageformats-5.58.0.tar.xz"; + sha256 = "deb5b18c8289e2ce1988769f6b87dd7ad57dde6c15e51a474e51eef76568a9d9"; + name = "kimageformats-5.58.0.tar.xz"; }; }; kinit = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kinit-5.57.0.tar.xz"; - sha256 = "7d5ca84d7bd554531aa6d720d3dc41ac091cf047a52d097a23e5c8fad08b684c"; - name = "kinit-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kinit-5.58.0.tar.xz"; + sha256 = "22c2adb9b1b52d0f90db9c36bd0313250d986a207f781c0582e85c4805297e53"; + name = "kinit-5.58.0.tar.xz"; }; }; kio = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kio-5.57.0.tar.xz"; - sha256 = "d68151d58f1ed2e0724074c6bca42510dd3e19617baa4b4130198ad3a36a64ab"; - name = "kio-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kio-5.58.0.tar.xz"; + sha256 = "14c74959824a288d7fae17acbd2786eee1f0a2545cb9bf39c43bbd862ec55069"; + name = "kio-5.58.0.tar.xz"; }; }; kirigami2 = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kirigami2-5.57.0.tar.xz"; - sha256 = "3cdbea0e472293e85e625820f6b9e2d20f59cff263ed150904b6b2acad81062b"; - name = "kirigami2-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kirigami2-5.58.0.tar.xz"; + sha256 = "ad54e15c03807181313e29013057cf89cb70113f74a26ab7aec6420cdc18d9b3"; + name = "kirigami2-5.58.0.tar.xz"; }; }; kitemmodels = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kitemmodels-5.57.0.tar.xz"; - sha256 = "b0eef30ce3e5f2fe9afb60d589bea16a0d0e4a57ffffb37ae0e14a54f1681464"; - name = "kitemmodels-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kitemmodels-5.58.0.tar.xz"; + sha256 = "f861844a6d24ecdddd7b2b29d47dc03bccbd5dc2c8053f5c3a839a5ff59cd491"; + name = "kitemmodels-5.58.0.tar.xz"; }; }; kitemviews = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kitemviews-5.57.0.tar.xz"; - sha256 = "6b499a21c88d5998c903e8e4dd480c612b96e5e31d17430a507c07566febdd30"; - name = "kitemviews-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kitemviews-5.58.0.tar.xz"; + sha256 = "bb073f96236102a953a2298039d0c380458c0a2393d7dc7bb657ee4e2ea9b6e6"; + name = "kitemviews-5.58.0.tar.xz"; }; }; kjobwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kjobwidgets-5.57.0.tar.xz"; - sha256 = "4b98e7cd9b8d877326854addcee300071afc92f4378d3a94734e470271638002"; - name = "kjobwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kjobwidgets-5.58.0.tar.xz"; + sha256 = "d43ea4eede2d88edd1753f4d1b6808bf04bf1e67ab58f00ef70b6a20b9607133"; + name = "kjobwidgets-5.58.0.tar.xz"; }; }; kjs = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kjs-5.57.0.tar.xz"; - sha256 = "865fb86566a0ea904ab0a3bd6a63787161b28578660d475fc316c50c8a7b1e90"; - name = "kjs-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kjs-5.58.0.tar.xz"; + sha256 = "9e95cb54f4323f31f88e3fb5946b4f990d8a5f1ba8fecf166844af672037a60c"; + name = "kjs-5.58.0.tar.xz"; }; }; kjsembed = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kjsembed-5.57.0.tar.xz"; - sha256 = "741aae8db274febe7e5d0d10dc99271efc590b2465d2c4d4e4a9162d2b36e3b4"; - name = "kjsembed-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kjsembed-5.58.0.tar.xz"; + sha256 = "ffbcd9de767d62497db146acd7bcaeaa59b3f6b418616d4562d1a2269048131d"; + name = "kjsembed-5.58.0.tar.xz"; }; }; kmediaplayer = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kmediaplayer-5.57.0.tar.xz"; - sha256 = "521dcb4b3f9a67203e9eac27b8d777cb22557861b9fae0006c2aecda96d9bad4"; - name = "kmediaplayer-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kmediaplayer-5.58.0.tar.xz"; + sha256 = "1cc831eae5f0e71375118c01b72e7961d42888fca0726800ce8c42bf4e1f21ea"; + name = "kmediaplayer-5.58.0.tar.xz"; }; }; knewstuff = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knewstuff-5.57.0.tar.xz"; - sha256 = "6a9d77a62b036b4ed0f32ffaa9f204db1403030d01dbe8fb055d02361db2f981"; - name = "knewstuff-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knewstuff-5.58.0.tar.xz"; + sha256 = "06d3ee09652f166ad66e003523bafe43741a99d2cd5dca3268ac7a13498cefbd"; + name = "knewstuff-5.58.0.tar.xz"; }; }; knotifications = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knotifications-5.57.0.tar.xz"; - sha256 = "7de068f4cf9bcefef54ae1cb180e2c0af9be951afbcaa960245507259620cf15"; - name = "knotifications-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knotifications-5.58.0.tar.xz"; + sha256 = "5a388e05ae3416a5120c268e48fa505e6666403772e8f03fe4670ab1d0bb0469"; + name = "knotifications-5.58.0.tar.xz"; }; }; knotifyconfig = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/knotifyconfig-5.57.0.tar.xz"; - sha256 = "e7fe39ed72b7f79d8cafe6c30d5c62ade0f33be37a62d9e5b929064dd1750ac1"; - name = "knotifyconfig-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/knotifyconfig-5.58.0.tar.xz"; + sha256 = "a40555d9645c4ed283e61a9e5718d5476359124e23d52a838e30fca7e089dc01"; + name = "knotifyconfig-5.58.0.tar.xz"; }; }; kpackage = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpackage-5.57.0.tar.xz"; - sha256 = "2d2d497d50e8ce986d6de4462391122963d9b7605889fd20cd3ceb4dd6910814"; - name = "kpackage-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpackage-5.58.0.tar.xz"; + sha256 = "41deff40eb17b3f667fd03f4a30dcf734ca060ebd7e2320eb38ff36ed6a9ce90"; + name = "kpackage-5.58.0.tar.xz"; }; }; kparts = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kparts-5.57.0.tar.xz"; - sha256 = "5a079986963d186e98a1174e19e490731012732ad5ad31a431a8f7a31c6b6ed2"; - name = "kparts-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kparts-5.58.0.tar.xz"; + sha256 = "6fe1ca552f14dd262cf33e60d0c85536ca04617757e39f91dbfe061abf624bb4"; + name = "kparts-5.58.0.tar.xz"; }; }; kpeople = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpeople-5.57.0.tar.xz"; - sha256 = "7c239b80b7976e3bfa46338e05a048aecb9c1972548dc33cc8a17e66eb08a85c"; - name = "kpeople-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpeople-5.58.0.tar.xz"; + sha256 = "2588f7a4df4c03fe756d9e766120e35b0f991df5c8e5f75c3a507cc5739ded32"; + name = "kpeople-5.58.0.tar.xz"; }; }; kplotting = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kplotting-5.57.0.tar.xz"; - sha256 = "c2c35030b1a2ca25f503c1a2df7ca225d156a9ea80f52883e136679aea6efc8e"; - name = "kplotting-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kplotting-5.58.0.tar.xz"; + sha256 = "4d46b4c78abcaf171132f4a17f35d28f7bd89b346fbe7b2e494f5212ee2cc81b"; + name = "kplotting-5.58.0.tar.xz"; }; }; kpty = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kpty-5.57.0.tar.xz"; - sha256 = "14a0f9d5ecc387c88d24270dbf4c128deb8ad18ab64b39766b335ad03a47c3b6"; - name = "kpty-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kpty-5.58.0.tar.xz"; + sha256 = "808a9f159e3d34630ae16d13c3ed6310c07fc9a38737110190892dcc903d5017"; + name = "kpty-5.58.0.tar.xz"; }; }; kross = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/portingAids/kross-5.57.0.tar.xz"; - sha256 = "3b0f92751bb70c64b2ac25b466f886cc8b02babf02c744bcc909aa3ce6915a66"; - name = "kross-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/portingAids/kross-5.58.0.tar.xz"; + sha256 = "b71c521718acd9829124264e97990222c458eca4a2e0be471a853db55b07d872"; + name = "kross-5.58.0.tar.xz"; }; }; krunner = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/krunner-5.57.0.tar.xz"; - sha256 = "40f52d4d883748f5b9a78b5bd7dd6aaa52eae88b89d7a33eafbcbb9ccf6f4805"; - name = "krunner-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/krunner-5.58.0.tar.xz"; + sha256 = "d83220210980117459e49a44b2173063faa70ea5524c744cde4ca3dc031a6c8c"; + name = "krunner-5.58.0.tar.xz"; }; }; kservice = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kservice-5.57.0.tar.xz"; - sha256 = "531940baa47273714fbc35941f2ef5fbdb801b7a5ed5fef5a8ff1d86bf1dae14"; - name = "kservice-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kservice-5.58.0.tar.xz"; + sha256 = "03e1d69b1558c4d38946e1ffdec4249e58d8a0f15575ce984c751d93b3ff1395"; + name = "kservice-5.58.0.tar.xz"; }; }; ktexteditor = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ktexteditor-5.57.0.tar.xz"; - sha256 = "aa510656f632ef09c18af4263386265c293cb929f139786acd102881250314c3"; - name = "ktexteditor-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ktexteditor-5.58.0.tar.xz"; + sha256 = "dc28916db7eb8a24f89b6570358d576b73e1ca60f7364871a0ef67f9fd62db8e"; + name = "ktexteditor-5.58.0.tar.xz"; }; }; ktextwidgets = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/ktextwidgets-5.57.0.tar.xz"; - sha256 = "b74036eea1ec19a22aa0e76cd1a8338f55e5c32a30dc47d602783c6bc5ba54bf"; - name = "ktextwidgets-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/ktextwidgets-5.58.0.tar.xz"; + sha256 = "056601d7c1aa412a9628fae8eb6ca6cf51d0f0fab03345bb4be8e7072827fed7"; + name = "ktextwidgets-5.58.0.tar.xz"; }; }; kunitconversion = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kunitconversion-5.57.0.tar.xz"; - sha256 = "157f4d21e83a6e92e30894f472b65452ecd2183ac2e25e24f740e971befed383"; - name = "kunitconversion-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kunitconversion-5.58.0.tar.xz"; + sha256 = "5716474c4d031d9b5fdb3fe460957d4ceecd1d9c4e441df81a42bfbb993232fa"; + name = "kunitconversion-5.58.0.tar.xz"; }; }; kwallet = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwallet-5.57.0.tar.xz"; - sha256 = "ad089026f4d5b10d567d0fd56f8b63749acd214fb8029d43187ba42afaf36975"; - name = "kwallet-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwallet-5.58.0.tar.xz"; + sha256 = "5203765ba2061727d0280bf7e9cbbade462ba2c5e7389f4f8d78afc522ba2030"; + name = "kwallet-5.58.0.tar.xz"; }; }; kwayland = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwayland-5.57.0.tar.xz"; - sha256 = "f00d2997163f559cecf30f5e945d5456628a0d120acafba49fa14af28c22b1d6"; - name = "kwayland-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwayland-5.58.0.tar.xz"; + sha256 = "a273a64ac06698e7c7d297da05c3b4889893c8b4179b01aa7ae1c2fb8681a4f1"; + name = "kwayland-5.58.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwidgetsaddons-5.57.0.tar.xz"; - sha256 = "abd80a566e1003bca7c72d3a0dc1ee470bc9935d11371cfff0d960f11e1ef5c2"; - name = "kwidgetsaddons-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwidgetsaddons-5.58.0.tar.xz"; + sha256 = "f4bcb1e22d8dfec214f4f55dbf4492229c4cb6ab63031f826ef68896c27ca6c0"; + name = "kwidgetsaddons-5.58.0.tar.xz"; }; }; kwindowsystem = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kwindowsystem-5.57.0.tar.xz"; - sha256 = "0c8a009dde7ca1722810777b99aa4e1a3471687460c25e0f41645c9e11daf274"; - name = "kwindowsystem-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kwindowsystem-5.58.0.tar.xz"; + sha256 = "0b25d55bc9be6329c5cf91328c4414b547f26496a1af83f9454c0e5d85a10129"; + name = "kwindowsystem-5.58.0.tar.xz"; }; }; kxmlgui = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kxmlgui-5.57.0.tar.xz"; - sha256 = "325124518e8fa4847c898dee193d96b76a7ba27d7c79d875f34c632f46fe1f90"; - name = "kxmlgui-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kxmlgui-5.58.0.tar.xz"; + sha256 = "ab08ed118f6806154fe10414d81dace413ecf80df3a561811f41879b48b7179f"; + name = "kxmlgui-5.58.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/kxmlrpcclient-5.57.0.tar.xz"; - sha256 = "d47d5cc49f050dda3a26f7654226c0d124ca5ba5503a60e606307426bbe43b9d"; - name = "kxmlrpcclient-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/kxmlrpcclient-5.58.0.tar.xz"; + sha256 = "53f647bb8d9165ddf6326703486470c7e9fc4ef392991501319e5c69f25f0ea3"; + name = "kxmlrpcclient-5.58.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/modemmanager-qt-5.57.0.tar.xz"; - sha256 = "030bfcfafd5079f25a165aaa5f52693a8fe4b3c15c1345a641716c4329e0929d"; - name = "modemmanager-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/modemmanager-qt-5.58.0.tar.xz"; + sha256 = "cec892b58603fd95656b2cac356e8076a65122d110e3f5175bbabfaa296b16cb"; + name = "modemmanager-qt-5.58.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/networkmanager-qt-5.57.0.tar.xz"; - sha256 = "4d2da2556bfeef4be03833d707284573b469a1f6ad66ba73eae80835bd2e1982"; - name = "networkmanager-qt-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/networkmanager-qt-5.58.0.tar.xz"; + sha256 = "113f48b1ed07b7541bc205220197e245f547e0a08382c3aeb29b0c02e6ec4abe"; + name = "networkmanager-qt-5.58.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/oxygen-icons5-5.57.0.tar.xz"; - sha256 = "2b12a9de3767d233b4b01bc97e23899d94c02b13fee4d20483d3f5d2baaaa1e5"; - name = "oxygen-icons5-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/oxygen-icons5-5.58.0.tar.xz"; + sha256 = "0e6a6fd611893c870901b78f601caf8ae9afd2a666088a5a167f3cbf815bd3e7"; + name = "oxygen-icons5-5.58.0.tar.xz"; }; }; plasma-framework = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/plasma-framework-5.57.0.tar.xz"; - sha256 = "b886aeee6691911ead25e6fd5631fa41ce2330b0fbbdc040717fa576bacae2ca"; - name = "plasma-framework-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/plasma-framework-5.58.0.tar.xz"; + sha256 = "0b0826a2292612112e78198938d660e913756f8712d1f2c71eafbead42605cad"; + name = "plasma-framework-5.58.0.tar.xz"; }; }; prison = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/prison-5.57.0.tar.xz"; - sha256 = "6613decb2e0b61af5af3a3a9995970c2fdaa72f36bcfd7e9db547017ee4ca235"; - name = "prison-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/prison-5.58.0.tar.xz"; + sha256 = "2bd97bf19e70b67cac49eaefb89a0fe8bd506e710e10df41f9b7c65d9dc30b1d"; + name = "prison-5.58.0.tar.xz"; }; }; purpose = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/purpose-5.57.0.tar.xz"; - sha256 = "4b38f1b88e6e621bc20c04a5f7bc7293fba6c851209167c5e794b6becaea244e"; - name = "purpose-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/purpose-5.58.0.tar.xz"; + sha256 = "8acbf11af0d9f149ca52c15d07a62107d83b02306102af9e37ee32aeaef831df"; + name = "purpose-5.58.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/qqc2-desktop-style-5.57.0.tar.xz"; - sha256 = "ff40fd6d48815c39e46e19eadf4048f04e79f34f7522a9ba655e6d4a1690546e"; - name = "qqc2-desktop-style-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/qqc2-desktop-style-5.58.0.tar.xz"; + sha256 = "71b2c94aece8c0f4cda33170a84240d1f7ed9ec774dcf5bd292bda861bda46a3"; + name = "qqc2-desktop-style-5.58.0.tar.xz"; }; }; solid = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/solid-5.57.0.tar.xz"; - sha256 = "fbdb0678a5a1b9f902661b4823dbae4629a88708b729d827dd0598799f727209"; - name = "solid-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/solid-5.58.0.tar.xz"; + sha256 = "7d7f2daaffe8536ee9373375b866c94b949e58f0365990dfe16f9cc05f98bd00"; + name = "solid-5.58.0.tar.xz"; }; }; sonnet = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/sonnet-5.57.0.tar.xz"; - sha256 = "08e13a707b64055f512bba982ec5e69a9e7c62c02d1ee8b6fdc67c67b1265334"; - name = "sonnet-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/sonnet-5.58.0.tar.xz"; + sha256 = "e67ffab7674175588883a9b444973e9edef2257e025f99657bb13d09e72bf823"; + name = "sonnet-5.58.0.tar.xz"; }; }; syndication = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/syndication-5.57.0.tar.xz"; - sha256 = "251b2333bd3e49f833ef5ac12e0d2540a7640c84625090a85d99715927653728"; - name = "syndication-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/syndication-5.58.0.tar.xz"; + sha256 = "48d321fdefd57ef9380492652c765ded047d4a54ba6aed5abb1434e30e327643"; + name = "syndication-5.58.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/syntax-highlighting-5.57.0.tar.xz"; - sha256 = "e82261e791005a55414fc81a396ca33ee8c061acd66c2c351492d866b3592e9f"; - name = "syntax-highlighting-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/syntax-highlighting-5.58.0.tar.xz"; + sha256 = "b97e58e9fe64bc21368d18c57b69dd5696328a0722c01ae2e113826e2e35ba76"; + name = "syntax-highlighting-5.58.0.tar.xz"; }; }; threadweaver = { - version = "5.57.0"; + version = "5.58.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.57/threadweaver-5.57.0.tar.xz"; - sha256 = "83969d0f6e4a337fba6b554708f867654af86368066ccef75a4fde85569d1ee0"; - name = "threadweaver-5.57.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.58/threadweaver-5.58.0.tar.xz"; + sha256 = "d9f95ed3a5ccedaa10ae086c82d8794a9ae9e82e094c352869bc6459ead8409d"; + name = "threadweaver-5.58.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch new file mode 100644 index 00000000000..2ea1b124ce7 --- /dev/null +++ b/pkgs/development/libraries/libheif/1.4.0-CVE-2019-11471.patch @@ -0,0 +1,15 @@ +Adapted from upstream commit 995a4283d8ed2d0d2c1ceb1a577b993df2f0e014 +--- a/libheif/heif_context.cc ++++ b/libheif/heif_context.cc +@@ -571,6 +571,11 @@ + image->set_is_alpha_channel_of(refs[0]); + + auto master_iter = m_all_images.find(refs[0]); ++ if (master_iter == m_all_images.end()) { ++ return Error(heif_error_Invalid_input, ++ heif_suberror_Nonexisting_item_referenced, ++ "Non-existing alpha image referenced"); ++ } + master_iter->second->set_alpha_channel(image); + } + diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix index 581a579cbe2..3182345bfd4 100644 --- a/pkgs/development/libraries/libheif/default.nix +++ b/pkgs/development/libraries/libheif/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vbjknkb2ccmw3xh2j8ljz5sj9i8wv92iw7zghcc5wn64sk1xkk2"; }; + patches = [ ./1.4.0-CVE-2019-11471.patch ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libde265 x265 libpng libjpeg ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index ce43ed73432..957201b83ab 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "libsass-${version}"; - version = "3.5.5"; + pname = "libsass"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0w6v1xa00jvfyk4b29ir7dfkhiq72anz015gg580bi7x3n7saz28"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "0c2cfmxv1h4f258l9ph6jrnk1ip5bngapzbw1x3vsqxw7hy20n4a"; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + extraPostFetch = '' + rm -r $out/test/e2e/unicode-pwd + ''; }; - patches = [ - (fetchpatch { - name = "CVE-2018-19827.patch"; - url = "https://github.com/sass/libsass/commit/b21fb9f84096d9927780b86fa90629a096af358d.patch"; - sha256 = "0ix12x9plmpgs3xda2fjdcykca687h16qfwqr57i5qphjr9vp33l"; - }) - ]; - preConfigure = '' export LIBSASS_VERSION=${version} ''; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index a1a171e9ecb..b7dd2c8ae17 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre116_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre118_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "ffe3e090cd41d0977ca74fafcb452838f76ceea1"; - sha256 = "1nmg89jgz1kbv7lv1drkkb4x0pank51sijagflxmnmvqgrk53gxd"; + rev = "2e719820d47cdb48308265f95547d2c9458bbfe7"; + sha256 = "0sm2k5f15ad9b9wh928kmbb399f5f7frfh96bi865pklavpcckf5"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 0014a1452aa..f43329d3553 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -106,6 +106,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index d84596bd054..ef0cf97a428 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -110,6 +110,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index d1e9af29926..9baca8124bd 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -108,6 +108,7 @@ let qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; }; + qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {}; qtquick1 = null; qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix new file mode 100644 index 00000000000..e6ef428cc3c --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -0,0 +1,6 @@ +{ qtModule, qtbase }: + +qtModule { + name = "qtnetworkauth"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix new file mode 100644 index 00000000000..74b8e381f93 --- /dev/null +++ b/pkgs/development/libraries/rttr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, ninja }: + +stdenv.mkDerivation rec { + pname = "rttr"; + version = "0.9.6"; + + src = fetchFromGitHub { + owner = "${pname}org"; + repo = pname; + rev = "v${version}"; + sha256 = "1yxad8sj40wi75hny8w6imrsx8wjasjmsipnlq559n4b6kl84ijp"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + cmakeFlags = [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_UNIT_TESTS=OFF" + "-DBUILD_PACKAGE=OFF" + ]; + + meta = with stdenv.lib; { + description = "C++ Reflection Library"; + homepage = https://www.rttr.org; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 72f6f57553f..91bf7e39378 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1jhjl7nw6262ks5zrk447qmh6z2r5rrnnrm742dk33d7031g3s55"; + sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 5d70a9f0a1c..b81fab1ed76 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -44,7 +44,7 @@ deployAndroidPackage { mkdir -p $out/bin for i in ndk-build do - ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i + ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done ''; noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix index 84ac1039628..157beaac4bc 100644 --- a/pkgs/development/ocaml-modules/logs/default.nix +++ b/pkgs/development/ocaml-modules/logs/default.nix @@ -9,11 +9,11 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; stdenv.mkDerivation rec { name = "ocaml-${pname}-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853"; + sha256 = "1lkhr7i44xw4kpfbhgj3rbqy3dv5bfm4kyrbl8a9rfafddcxlwss"; }; buildInputs = [ ocaml findlib ocamlbuild topkg fmt cmdliner lwt ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 5e45aeb0979..efc4c824a39 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.9.5"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "94423d1a56cdec2ef47699e02c9a48cf8827b9c4465b836c0cefb30afe85e59a"; + sha256 = "1hdysr9z28sgwv47mivf4iyr1sg19hgfz349dghgdlk3rkl6v0s5"; }; doCheck = false; # bash-completion test fails with "compgen: command not found". diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index d83e2fdbf44..d71f0b640f9 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "asciimatics"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "9101b0b6885542f324980bbe13a772475cd6a12678f601228eaaea412db919ab"; + sha256 = "132y3gc0dj9vmgajmzz2fyc3icrrgsvynwfl0g31bylm7h9p220x"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index b38ce7c91ce..a9c012ba831 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "asynctest"; - version = "0.12.4"; + version = "0.13.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "ade427a711d18016f35fb0c5d412f0ed63fb074a6084b67ff2dad48f50b0d6ca"; + sha256 = "1b3zsy7p84gag6q8ai2ylyrhx213qdk2h2zb6im3xn0m5n264y62"; }; postPatch = '' diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix new file mode 100644 index 00000000000..65d225dc377 --- /dev/null +++ b/pkgs/development/python-modules/curio/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytest +, sphinx +}: + +buildPythonPackage rec { + pname = "curio"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "51d1a7b49b4f8dd1486ac785c72d522962e93ccfdcfc1f818f5c7553a307b5ef"; + }; + + disabled = !isPy3k; + + checkInputs = [ pytest sphinx ]; + + # test_aside_basic times out, + # test_aside_cancel fails because modifies PYTHONPATH and cant find pytest + checkPhase = '' + pytest --deselect tests/test_task.py::test_aside_basic --deselect tests/test_task.py::test_aside_cancel + ''; + + meta = with lib; { + homepage = "https://github.com/dabeaz/curio"; + description = "Library for performing concurrent I/O with coroutines in Python 3"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 477468a0eb3..6f82adc94ca 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deluge-client"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "7c2bb6baa3183f039125fc490f47f8c6699312c3e69fcada89e9e70f63c6e092"; + sha256 = "1ragmpihjr9p6n27hw7gy83qyc68csqpn18m9kvwsby1vi7mgdy8"; }; # it will try to connect to a running instance diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index bdc31856f33..73bc143beeb 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distlib"; - version = "0.2.8"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "068zqb3w7nyqiv2hpy0zcpz2xd6xwhq5chigqrp9h9zav7bpr5sp"; + sha256 = "1z9c4ig19hjk18agwljv5ib3pphicg50w9z5zsnqn97q7vnv17gm"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix new file mode 100644 index 00000000000..8f3065633a1 --- /dev/null +++ b/pkgs/development/python-modules/django/2_2.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchPypi, substituteAll, + isPy3k, + geos, gdal, pytz, sqlparse, + withGdal ? false +}: + +buildPythonPackage rec { + pname = "Django"; + version = "2.2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1spa701phl8ha7qmfr89hwpa43kf52zbrs3xyc0rlvxianykrk3g"; + }; + + patches = stdenv.lib.optional withGdal + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + }) + ; + + propagatedBuildInputs = [ pytz sqlparse ]; + + # too complicated to setup + doCheck = false; + + meta = with stdenv.lib; { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + license = licenses.bsd3; + maintainers = with maintainers; [ georgewhewell lsix ]; + }; +} diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 0bb1e00778a..0c87f309489 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "6f25cc4761ac109efd503f096e2ad99421b1159f01a29dbb917359dcd68e08ca"; + sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; }; propagatedBuildInputs = [ faker ]; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index b79999bba41..2204c25e6bc 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -16,23 +16,23 @@ assert pythonOlder "3.3" -> ipaddress != null; buildPythonPackage rec { pname = "Faker"; - version = "1.0.5"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "3f2f4570df28df2eb8f39b00520eb610081d6552975e926c6a2cbc64fd89c4c1"; + sha256 = "1jins8jlqyxjwx6i2h2jknwwfpi0bpz1qggvw6xnbxl0g9spyiv0"; }; buildInputs = [ pytestrunner ]; checkInputs = [ email_validator freezegun - mock - more-itertools pytest random2 ukpostcodeparser - ]; + ] + ++ lib.optionals (pythonOlder "3.3") [ mock ] + ++ lib.optionals (pythonOlder "3.0") [ more-itertools ]; propagatedBuildInputs = [ dateutil diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 92e4542bfef..b03f3307d08 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.10.0"; + version = "0.10.1"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1xvk289628l3pp56gidwhmd54cgdczpsxhxfw0bfcsd120k1svfv"; + sha256 = "0hbp0lrdlzpcdjv1jn2hk98z9gg624nswcm0hi48k4rk28x9xsb9"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 291d038258f..d59bc5a70b8 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.7.8"; + version = "1.7.9"; src = fetchPypi { inherit pname version; - sha256 = "0n18frf0ghmwf5lxmkyski4b5h1rsx93ibq3iw0k3s2wxl371406"; + sha256 = "1v551xaavqff085gplinnnrz2sk6sikmm7j47gi0wf34hpba1384"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index 63c7188f03a..2c24d7b9d6a 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.5"; + version = "0.4.6"; src = fetchPypi { inherit pname version; - sha256 = "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9"; + sha256 = "0pxcwk5lc8ljil77xqywr0bq1xxj11z92lpfj185ac72d2b1sma5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 7ce31228705..3fa1acb875a 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "6.2.3"; + version = "6.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1k9701r120gv0an0wxvcjrbmhns8lq3zj6px5y2izly56j2dafqy"; + sha256 = "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn"; }; buildInputs = [ nose ]; diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 2e8abf0da52..494a4f8fc06 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "kitchen"; - version = "1.2.5"; + version = "1.2.6"; src = fetchPypi { inherit pname version; - sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd"; + sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index a3c084cc8c6..e329f36a716 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -5,34 +5,26 @@ , django , tornado , six -, pytest }: buildPythonPackage rec { pname = "livereload"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "lepture"; repo = "python-livereload"; rev = "v${version}"; - sha256 = "0p3yvvr1iv3fv3pwc2qfzl3mi3b5zv6dh7kmfm1k7krxvganj87n"; + sha256 = "15v2a0af897ijnsfjh2r8f7l5zi5i2jdm6z0xzlyyvp9pxd6mpfm"; }; - buildInputs = [ nose django ]; + buildInputs = [ django ]; propagatedBuildInputs = [ tornado six ]; - # Remove this patch when PR merged - # https://github.com/lepture/python-livereload/pull/173 - postPatch = '' - substituteInPlace tests/test_watcher.py \ - --replace 'watcher.watch(filepath, add_count)' \ - 'add_count.repr_str = "add_count test task"; watcher.watch(filepath, add_count)' - ''; - - checkInputs = [ pytest ]; - checkPhase = "pytest tests"; + checkInputs = [ nose ]; + # TODO: retry running all tests after v2.6.1 + checkPhase = "NOSE_EXCLUDE=test_watch_multiple_dirs nosetests -s"; meta = { description = "Runs a local server that reloads as you develop"; diff --git a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 6412e04f93d..01f80473fee 100644 --- a/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow-sqlalchemy"; - version = "0.16.2"; + version = "0.16.3"; meta = { homepage = "https://github.com/marshmallow-code/marshmallow-sqlalchemy"; @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "755e6e930c1ffe3430f62091085f0a51e0817b240986d931014f03b3556fff34"; + sha256 = "0qzpl53r58fk328cn41365c6jkliwmj41v16zkyjxb9d4s2mvn14"; }; propagatedBuildInputs = [ marshmallow sqlalchemy ]; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index bc4c4b20aa4..88008cd9530 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -1,23 +1,25 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, zope_interface +, zope_interface, cffi , sphinx, manuel }: buildPythonPackage rec { pname = "persistent"; - version = "4.4.3"; + version = "4.5.0"; nativeBuildInputs = [ sphinx manuel ]; - propagatedBuildInputs = [ zope_interface ]; + propagatedBuildInputs = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; - sha256 = "05hi8yfvxl5ns7y7xhbgbqp78ydaxabjp5b64r4nmrfdfsqylrb7"; + sha256 = "0slbvq1m3rilgyhj6i522rsyv592xv9pmvm61mrmgkgf40kfnz69"; }; meta = { description = "Automatic persistence for Python objects"; - homepage = http://www.zope.org/Products/ZODB; + homepage = "http://www.zodb.org/"; + license = lib.licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 9f87d8a16cb..4d064af18fa 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -1,20 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "pex"; - version = "1.6.6"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "ca887bedc9c6e0eab72fcb4c20eda8fff975d06b75993a85ee1dfc763ba38e86"; + sha256 = "1hg30y8b4b96r4skhz2qmsp7li1izcg8854q3fi48rks0kcfx5fw"; }; - prePatch = '' - substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"' - ''; + nativeBuildInputs = [ setuptools ]; # A few more dependencies I don't want to handle right now... doCheck = false; @@ -24,7 +23,6 @@ buildPythonPackage rec { homepage = "https://github.com/pantsbuild/pex"; license = licenses.asl20; maintainers = with maintainers; [ copumpkin ]; - broken = true; }; } diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 9b5991a424c..4d8d0589eda 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, setuptools_scm, pygccxml }: +{ stdenv, fetchPypi, buildPythonPackage, isPy3k, setuptools_scm, pygccxml }: buildPythonPackage rec { pname = "PyBindGen"; version = "0.19.0"; @@ -11,6 +11,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; checkInputs = [ pygccxml ]; + doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k meta = with stdenv.lib; { homepage = https://github.com/gjcarneiro/pybindgen; @@ -19,5 +20,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ teto ]; }; } - - diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index 4227a255ad3..0e19b971a16 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyutilib"; - version = "5.6.5"; + version = "5.7.0"; src = fetchPypi { pname = "PyUtilib"; inherit version; - sha256 = "4730084624be98f2c326da88f3852831c6aa919e11babab2c34b0299c8f5ce2a"; + sha256 = "086fzgjb2mjgkfhg1hvc2gcyam2ab28mijygwica5fg4zz6rn32l"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index f5a563545a1..5d825f7579e 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,22 +1,22 @@ -{ buildPythonPackage, lib, fetchFromGitHub +{ buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3 +, pytest, pytestcov, packaging, hypothesis, boto3, mock }: buildPythonPackage rec { pname = "rasterio"; - version = "1.0.22"; + version = "1.0.23"; # Pypi doesn't ship the tests, so we fetch directly from GitHub src = fetchFromGitHub { owner = "mapbox"; repo = "rasterio"; rev = version; - sha256 = "1gx48qjiahlwflmjlkndp3ricd03jmzfx7i9ffgq7a2i6gcm36zp"; + sha256 = "1xypc86prwkv6ypy87g6r1p5y6d6c51vfxd3z6hjd1hv2ks7zjs1"; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis ]; + checkInputs = [ boto3 pytest pytestcov packaging hypothesis ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ gdal numpy attrs affine cligj click-plugins snuggs ]; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index bdbc3629ec7..76fc508a5d8 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "rpmfluff"; - version = "0.5.6"; + version = "0.5.7.1"; src = fetchurl { url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l"; + sha256 = "19vnlzma8b0aghdiixk0q3wc10y6306hsnic0qvswaaiki94fss1"; }; LC_ALL="en_US.utf-8"; diff --git a/pkgs/development/python-modules/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index 9893bc5828a..f5674c09e02 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -1,26 +1,27 @@ { buildPythonPackage, lib, fetchPypi, glibcLocales, isPy3k, contextvars -, pythonOlder +, pythonOlder, pytest, curio }: buildPythonPackage rec { pname = "sniffio"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1dzb0nx3m1hpjgsv6s6w5ac2jcmywcz6gqnfkw8rwz1vkr1836rf"; + sha256 = "8e3810100f69fe0edd463d02ad407112542a11ffdc29f67db2bf3771afb87a21"; }; - # breaks with the following error: - # > TypeError: 'encoding' is an invalid keyword argument for this function disabled = !isPy3k; buildInputs = [ glibcLocales ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ contextvars ]; - # no tests distributed with PyPI - doCheck = false; + checkInputs = [ pytest curio ]; + + checkPhase = '' + pytest + ''; meta = with lib; { homepage = https://github.com/python-trio/sniffio; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix new file mode 100644 index 00000000000..3a21ce57fe7 --- /dev/null +++ b/pkgs/development/python-modules/tld/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchPypi, python }: + +python.pkgs.buildPythonPackage rec { + pname = "tld"; + version = "0.9.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0i0prgwrmm157h6fa5bx9wm0m70qq2nhzp743374a94p9s766rpp"; + }; + + propagatedBuildInputs = with python.pkgs; [ six ]; + checkInputs = with python.pkgs; [ factory_boy faker pytest pytestcov tox ]; + + # https://github.com/barseghyanartur/tld/issues/54 + disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([ + "test_1_update_tld_names" + "test_1_update_tld_names_command" + "test_2_update_tld_names_module" + ]); + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -k '${disabledTests}' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/barseghyanartur/tld; + description = "Extracts the top level domain (TLD) from the URL given"; + license = licenses.lgpl21; + maintainers = with maintainers; [ genesis ]; + }; + +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 390c0e44133..a5e6ed3d2dd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.98.1"; + version = "0.99.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1ik758ca6mfybnzb987fa8blqaskqbfk5hkzl4yg1j08p7kli5ll"; + sha256 = "0afm3mz2b4aivqm3hbp6kc7d7a5v89r13x7dahzhf7l21qjv3mz5"; }; installPhase = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 002d90e3f1f..9d429ab9ba3 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,14 +3,15 @@ , go-md2man }: let - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { - rev = "v${version}"; - owner = "containers"; - repo = "buildah"; - sha256 = "1w8w10pw5mpr3lc78z2dx3vck40cl7s3zsizsxhs0a9kxnfp01j9"; + rev = "v${version}"; + owner = "containers"; + repo = "buildah"; + sha256 = "1r91ndnc3ysrfdjybsnlnbkw26n25mfwc9i8ys5y3c26fq8ic3zd"; }; + goPackagePath = "github.com/containers/buildah"; in buildGoPackage rec { diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix index aea94633bae..653d0d4505e 100644 --- a/pkgs/development/tools/castxml/default.nix +++ b/pkgs/development/tools/castxml/default.nix @@ -2,37 +2,39 @@ , pythonPackages , cmake , llvmPackages +, libffi, libxml2, zlib , withMan ? true }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "CastXML"; - version = "20180403"; + version = "0.2.0"; src = fetchFromGitHub { - owner = "CastXML"; - repo = "CastXML"; - rev = "c2a44d06d9379718292b696f4e13a2725ff9d95e"; - sha256 = "1hjh8ihjyp1m2jb5yypp5c45bpbz8k004f4p1cjw4gc7pxhjacdj"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1qpgr5hyb692h7l5igmq53m6a6vi4d9qp8ks893cflfx9955h3ip"; }; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + cmakeFlags = [ "-DCLANG_RESOURCE_DIR=${llvmPackages.clang-unwrapped}" "-DSPHINX_MAN=${if withMan then "ON" else "OFF"}" ]; buildInputs = [ - cmake llvmPackages.clang-unwrapped llvmPackages.llvm - ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ]; + libffi libxml2 zlib + ]; - propagatedbuildInputs = [ llvmPackages.libclang ]; + propagatedBuildInputs = [ llvmPackages.libclang ]; - # 97% tests passed, 96 tests failed out of 2866 + # 97% tests passed, 97 tests failed out of 2881 # mostly because it checks command line and nix append -isystem and all - doCheck=false; + doCheck = false; checkPhase = '' # -E exclude 4 tests based on names # see https://github.com/CastXML/CastXML/issues/90 @@ -40,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.kitware.com; + homepage = "https://github.com/CastXML/CastXML"; license = licenses.asl20; description = "Abstract syntax tree XML output tool"; platforms = platforms.unix; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 929dfc61ba3..7813eba0436 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,38 +1,32 @@ { mkDerivation, lib, fetchFromGitHub, cmake, antlr -, qtbase, qttools, qscintilla, sqlite }: +, qtbase, qttools, sqlite }: mkDerivation rec { - version = "3.10.1"; - name = "sqlitebrowser-${version}"; + version = "3.11.2"; + pname = "sqlitebrowser"; src = fetchFromGitHub { - repo = "sqlitebrowser"; - owner = "sqlitebrowser"; + repo = pname; + owner = pname; rev = "v${version}"; - sha256 = "1brzam8yv6sbdmbqsp7vglhd6wlx49g2ap8llr271zrkld4k3kar"; + sha256 = "0ydd5fg76d5d23byac1f7f8mzx3brmd0cnnkd58qpmlzi7p9hcvx"; }; - buildInputs = [ qtbase qscintilla sqlite ]; + buildInputs = [ qtbase sqlite ]; nativeBuildInputs = [ cmake antlr qttools ]; + # Use internal `qscintilla` rather than our package to fix the build + # (https://github.com/sqlitebrowser/sqlitebrowser/issues/1348#issuecomment-374170936). + # This can probably be removed when https://github.com/NixOS/nixpkgs/pull/56034 is merged. + cmakeFlags = [ "-DFORCE_INTERNAL_QSCINTILLA=ON" ]; + NIX_LDFLAGS = [ "-lQt5PrintSupport" ]; enableParallelBuilding = true; - # We have to patch out Test and PrintSupport to make this work with Qt 5.9 - # It can go when the application supports 5.9 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace Test "" \ - --replace PrintSupport "" - - substituteInPlace libs/qcustomplot-source/CMakeLists.txt \ - --replace PrintSupport "" - ''; - meta = with lib; { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index f02105aede9..3a2040e712a 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -4,18 +4,19 @@ with stdenv.lib; buildGoPackage rec { name = "kind-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { - rev = "${version}"; + rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - sha256 = "14ddhml9rh7x4j315fb332206xbn1rzx3i0ngj3220vb6d5dv8if"; + sha256 = "1azl5knw1n7g42xp92r9k7y4rzwp9xx0spcldszrpry2v4lmc5sb"; }; # move dev tool package that confuses the go compiler patchPhase = "rm -r hack"; + goDeps = ./deps.nix; goPackagePath = "sigs.k8s.io/kind"; excludedPackages = "images/base/entrypoint"; diff --git a/pkgs/development/tools/kind/deps.nix b/pkgs/development/tools/kind/deps.nix new file mode 100644 index 00000000000..1681fe9e2eb --- /dev/null +++ b/pkgs/development/tools/kind/deps.nix @@ -0,0 +1,507 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "56545f4a5d46"; + sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "v1.1.0"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "de5bf2ad4578"; + sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "v0.17.0"; + sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "v0.17.0"; + sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "v0.19.0"; + sha256 = "1527dbn74c0gw9gib5lmdr5vjgp5h57r1j92c3wh37irz90vnb6a"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "v0.17.0"; + sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.2.1"; + sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "4bd1920723d7"; + sha256 = "0z21hxin616xvkv075vdz416zm36qs0mbi76526l9yz8khbg7jmr"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/googleapis/gnostic"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gnostic"; + rev = "68f4ded48ba9"; + sha256 = "0l6qkbpmy2qd0q8h7dghhv27qjngll739kzm389qdbjxj3inq2dl"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.1.0"; + sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "60711f1a8329"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/munnerz/goautoneg"; + fetch = { + type = "git"; + url = "https://github.com/munnerz/goautoneg"; + rev = "a547fc61f48d"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "11459a886d9c"; + sha256 = "1nswc1fnrrs792qbix05h91bilj8rr3wxmxgwi97p2gjk0r292zh"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "dcabb60a477c"; + sha256 = "1775lv5jbsgv3ghq5v2827slqlhqdadrzc1nkpq4y0hdv2qzrgkm"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.1"; + sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3ec191127204"; + sha256 = "0zzhbkw3065dp1jscp7q8dxw3mkwj95ixnrr8j7c47skis0m11i3"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "1f849cf54d09"; + sha256 = "19a3srk9dcqad3sqd8mfg36pbaxcfkbzhp3jinhqxnzd90bds6am"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; + sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "k8s.io/api"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/api"; + rev = "6e4e0e4f393b"; + sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1"; + }; + } + { + goPackagePath = "k8s.io/apimachinery"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/apimachinery"; + rev = "6a84e37a896d"; + sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "v11.0.0"; + sha256 = "006007k55b5q95fa0vih4bprwvx5sk4a5chvsn46baqa5znphyn1"; + }; + } + { + goPackagePath = "k8s.io/gengo"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/gengo"; + rev = "0689ccc1d7d6"; + sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "v0.3.0"; + sha256 = "05lp8ddqnbypgszv3ra7x105qpr8rr1g4rk2148wcmgfjrfhw437"; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "a01b7d5d6c22"; + sha256 = "182s6gqhzal5602dfyk9h8adsdqgh5fmgh0bifksp1x856v4aizx"; + }; + } + { + goPackagePath = "sigs.k8s.io/kustomize"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/kustomize"; + rev = "v2.0.3"; + sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; + }; + } + { + goPackagePath = "sigs.k8s.io/structured-merge-diff"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/structured-merge-diff"; + rev = "ea680f03cc65"; + sha256 = "1drc908qcvwifvbz12vxahplycnaj177pz5ay6ygbn3q8824qv7b"; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "v1.0.0"; + sha256 = "0hpzghf1a4cwawzhkiwdzin80h6hd09fskl77d5ppgc084yvj8x0"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128cc"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "9f3314589c9a"; + sha256 = "13rr34jmgisgy8mc7yqz3474w4qbs01gz4b7zrgkvikdv4a6py3h"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "9d24e82272b4"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "8fab8cb257d5"; + sha256 = "0ckkl9zj8c0p5csfgsnvgb3vm91l2zgxgxhbjcf3ds3wryljalyj"; + }; + } +] diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index c3553d04981..49b12b60b14 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "5.0"; + version = "5.1"; src = fetchurl { url = "https://strace.io/files/${version}/${name}.tar.xz"; - sha256 = "1nj7wvsdmhpp53yffj1pnrkjn96mxrbcraa6h03wc7dqn9zdfyiv"; + sha256 = "12wsga1v3rab24gr0mpfip7j7gwr90m8f9h6fviqxa3xgnwl38zm"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 75e898fdb3f..f91ae713200 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; name = "${pname}-${version}"; - version = "3.1.0"; + version = "3.4.0"; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec src = fetchurl { url = "https://github.com/besport/${pname}/archive/${version}.tar.gz"; - sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; + sha256 = "0i7cck6zlgwjpksb4s1jpy193h85jixf4d0nmqj09y3zcpn2i8gb"; }; meta = { diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index b6ba02633ac..421aeb9ad91 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.14"; + version = "0.0.25"; src = fetchPypi { inherit pname version; - sha256 = "12gh9l13lwnlp330jl3afy3wgfkpjvdxr43flrg9k9kyyhbr191g"; + sha256 = "f6857cdc3c53c8ce9ba7a560c2759c10b988f3d9fafde912d3fa4deecb4d4664"; }; propagatedBuildInputs = [ pyserial pyudev ]; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index d6c5718d3ec..0bf1c61c959 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup.rs"; rev = version; - sha256 = "0lyn06vzp5406sjng7msifigkal2lafppqjbdnigx8yvgxqgd06f"; + sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x"; }; - cargoSha256 = "0yxjy1kls80fcpwskklmihkqva16s6mawa8rdxc3zz8g588am03c"; + cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11"; nativeBuildInputs = [ pkgconfig ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { '') ]; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; postInstall = '' pushd $out/bin @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { homepage = https://www.rustup.rs/; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 5598dc1606d..db4d9dcd1ac 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, autoreconfHook, libsass }: +{ stdenv, fetchFromGitHub, autoreconfHook, libsass }: stdenv.mkDerivation rec { - name = "sassc-${version}"; - version = "3.5.0"; + pname = "sassc"; + version = "3.6.0"; - src = fetchurl { - url = "https://github.com/sass/sassc/archive/${version}.tar.gz"; - sha256 = "0hl0j4ky13fzcv2y7w352gaq8fjmypwgazf7ddqdv0sbj8qlxx96"; + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = version; + sha256 = "14cbprnz70bv9qcs1aglvj9kkhf22as5xxz7gkv2ni8yjy8rp8q2"; }; patchPhase = '' diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 66133b432ee..06eb3e45e6f 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.2.0"; - sha256 = "10vr8yqrvdmcaszg7l7cjchzzik709vcygcnpkjf2sjhz929glf5"; + version = "12.3.1"; + sha256 = "1zhb5nq9s6cshbm6lf7qsy310fcsiy9wdr869vs6hw76zyn50axs"; } diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index b29add5d057..cf877521144 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "8.15.1"; - sha256 = "1ldd4p7cf7bjl4yg9d91khzd9662g3wda7g1yr0ljqjjyjiqcr3b"; + version = "8.16.0"; + sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m"; } |