diff options
Diffstat (limited to 'pkgs/applications')
174 files changed, 2587 insertions, 2915 deletions
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 65e1dbc9b198..a47b7fa3168f 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.3"; + version = "1.8.6"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -27,7 +27,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf"; + sha256 = "1n6f34r7zlc64l1q8xzcjk5sljdznjwp81d9naapprhpqb8g01gl"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index ed78133a759c..9cbab6ad0955 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,7 +1,7 @@ let - version = "1.10.0"; - sha256 = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g"; - cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m"; + version = "1.10.2"; + sha256 = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l"; + cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh"; patches = [ ./patches/vendored-sources-1.10.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 991799321094..d85fc25355c8 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.9.5"; - sha256 = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7"; - cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva"; + version = "1.9.7"; + sha256 = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph"; + cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0"; patches = [ ./patches/vendored-sources-1.9.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch index 3e8e032f30c2..e59858442c9e 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch @@ -2,7 +2,7 @@ diff --git a/.cargo/config b/.cargo/config index 72652ad2f..b21c6aa7b 100644 --- a/.cargo/config +++ b/.cargo/config -@@ -1,3 +1,113 @@ +@@ -1,3 +1,108 @@ [target.x86_64-pc-windows-msvc] # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 rustflags = ["-Ctarget-feature=+crt-static"] @@ -42,6 +42,11 @@ index 72652ad2f..b21c6aa7b 100644 +rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -97,16 +102,6 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" @@ -116,3 +111,4 @@ index 72652ad2f..b21c6aa7b 100644 +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" +replace-with = "vendored-sources" ++ diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch index d91b103c6cef..3e1ba2429f2d 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch @@ -1,10 +1,9 @@ diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 000000000..0efb69724 ---- /dev/null +--- /dev/null +++ b/.cargo/config -@@ -0,0 +1,100 @@ -+ +@@ -0,0 +1,94 @@ +[source."https://github.com/alexcrichton/mio-named-pipes"] +git = "https://github.com/alexcrichton/mio-named-pipes" +branch = "master" @@ -30,6 +29,11 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/bn"] +git = "https://github.com/paritytech/bn" +branch = "master" @@ -85,16 +89,6 @@ index 000000000..0efb69724 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/wasm-utils"] -+git = "https://github.com/paritytech/wasm-utils" -+branch = "master" -+replace-with = "vendored-sources" -+ -+[source."https://github.com/paritytech/wasmi"] -+git = "https://github.com/paritytech/wasmi" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tailhook/rotor"] +git = "https://github.com/tailhook/rotor" +branch = "master" diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index b8ff3daec606..6379975e951c 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -70,7 +70,9 @@ let free = stdenv.mkDerivation { name = "clementine-free-${version}"; - inherit src patches nativeBuildInputs buildInputs postPatch; + inherit src patches nativeBuildInputs postPatch; + + buildInputs = buildInputs ++ [ makeWrapper ]; cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ]; @@ -78,6 +80,11 @@ let passthru.unfree = unfree; + postInstall = '' + wrapProgram $out/bin/clementine \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ''; + meta = with stdenv.lib; { homepage = http://www.clementine-player.org; description = "A multiplatform music player"; @@ -108,8 +115,7 @@ let rmdir $out/bin makeWrapper ${free}/bin/clementine $out/bin/clementine \ - --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine mkdir -p $out/share for dir in applications icons kde4; do diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index c2adc58f9ce5..099e4428016e 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://gmpclient.org; + homepage = https://gmpclient.org; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; maintainers = [ maintainers.rickynils ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index bcb301687089..62bc2fa6f36f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.36.1"; + version = "0.37.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0"; + sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 680542dc405b..4c9540607eb6 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { name = "kid3-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz"; - sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p"; + sha256 = "1bbnd6jgahdiqmsbw6c3x4h517m50db592fnq1w0v4k5aaav4i26"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index ac945bee7f74..efaef97257e0 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index ee0ebf234ce5..3ffc5265f7a0 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://mpg321.sourceforge.net/; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 60c8f90b6d15..2ce82eb6a0a0 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr"; + sha256 = "0q8k7nsjm6m0r0zs1br60niaqlwvd3myqalb5sqijzanx41aq2l6"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; @@ -78,7 +78,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # XXX: as of 0.2.2, tries to download gmock instead of checking for provided + doCheck = false; checkPhase = "ctest"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 87bf440ed4f3..324818736694 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.77.338.g758ebd78-41"; + version = "1.0.79.223.g92622cc2-21"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606"; + sha256 = "1x1rpprzin4cmz1spzw036b4phd0yk1v7idlrcy4pkv97b4g5dw6"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index ccbceddefd2f..47b0bf2e736c 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -5,7 +5,7 @@ let arch = if stdenv.isAarch64 then "arm64" - else if stdenv.isArm + else if stdenv.isAarch32 then "arm_armhf_raspberry_pi" else if stdenv.is64bit then "x86_64" diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 75385275ec84..630f5dd34471 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk"; }; latestVersion = { - version = "3.2.0.11"; # "Android Studio 3.2 Canary 12" - build = "181.4729833"; - sha256Hash = "1b976m59d230pl35ajhdic46cw8qmnykkbrg3l7am7zmih0zk64c"; + version = "3.2.0.12"; # "Android Studio 3.2 Canary 13" + build = "181.4749738"; + sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 7b989f8df1f9..ca223803f04d 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1gyxys3mwwizc88vlb6j769b6r4ibjnqs6pg5iv336b13f9acyvr"; + sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix index c173684fab4c..091635feda6f 100644 --- a/pkgs/applications/editors/emacs-modes/calfw/default.nix +++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ chaoflow ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index e47da7a41934..306fe66823c8 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -92,7 +92,7 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; }; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 84ba32c41256..aedfb1fec3de 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -239,12 +239,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */ + sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -265,12 +265,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */ + sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "goland_release"; @@ -278,12 +278,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */ + sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -291,12 +291,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */ + sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -317,12 +317,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */ + sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm_Release"; @@ -330,12 +330,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */ + sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm_Release"; @@ -356,12 +356,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.3.3"; /* updated by script */ + version = "2017.3.4"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */ + sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "rm2017.3"; @@ -369,12 +369,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.1"; /* updated by script */ + version = "2018.1.2"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */ + sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WS_Release"; diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 751b78ab674b..764877a11cb3 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/moe/; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } # TODO: a configurable, global moerc file diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/editors/okteta/default.nix index 0ac8ddebc75d..770eb63dc69e 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,16 +1,22 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, shared-mime-info }: -mkDerivation { +let + version = "17.12.3"; +in mkDerivation rec { name = "okteta"; + src = fetchurl { + url = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz"; + sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; + }; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ peterhoeg ]; + maintainers = with lib.maintainers; [ peterhoeg bkchr ]; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; buildInputs = [ shared-mime-info ]; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 447e729d4f9b..d3d95e5886a5 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 8444ff6eaecc..b23db38e0f45 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr"; + sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v"; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free, easy to use and flexible tile map editor"; - homepage = http://www.mapeditor.org/; + homepage = https://www.mapeditor.org/; license = with licenses; [ bsd2 # libtiled and tmxviewer gpl2Plus # all the rest diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7c6d186b8830..d687712fc08a 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { name = "typora-${version}"; - version = "0.9.44"; + version = "0.9.47"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5"; + sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9"; } else fetchurl { url = "https://www.typora.io/linux/typora_${version}_i386.deb"; - sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3"; + sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6"; } ; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 0f81b0bdd640..9ffa31f2f2e0 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -4,6 +4,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE +, vimPlugins # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -80,6 +81,11 @@ composableDerivation { flags = { ftNix = { patches = [ ./ft-nix-support.patch ]; + preConfigure = '' + cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim + cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim + cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim + ''; }; } // edf { diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch index 5feb9c879517..274d855731fd 100644 --- a/pkgs/applications/editors/vim/ft-nix-support.patch +++ b/pkgs/applications/editors/vim/ft-nix-support.patch @@ -6,7 +6,7 @@ index a8e6261..2b008fc 100644 " Z80 assembler asz80 au BufNewFile,BufRead *.z8a setf z8a -+" NIX ++" Nix +au BufNewFile,BufRead *.nix setf nix + augroup END @@ -18,79 +18,3 @@ index a8e6261..2b008fc 100644 unlet s:cpo_save + + -diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim -new file mode 100644 -index 0000000..a2f9918 ---- /dev/null -+++ b/runtime/syntax/nix.vim -@@ -0,0 +1,56 @@ -+" Vim syntax file -+" Language: nix -+" Maintainer: Marc Weber <marco-oweber@gmx.de> -+" Modify and commit if you feel that way -+" Last Change: 2011 Jun -+" -+" this syntax file can be still be enhanced very much.. -+" Don't ask, do it :-) -+" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with -+" the patch found in vim_configurable (nixpkgs) -+ -+" Quit when a (custom) syntax file was already loaded -+if exists("b:current_syntax") -+ finish -+endif -+ -+ -+sy cluster nixStrings contains=nixStringParam,nixStringIndented -+ -+syn keyword nixKeyword let throw inherit import true false null with -+syn keyword nixConditional if else then -+syn keyword nixBrace ( ) { } = -+syn keyword nixBuiltin __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists -+ \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList -+ \ __head __tail __add __sub __lessThan __substring __stringLength -+ -+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam -+" syn region nixString start=+"+ skip=+\\"+ end=+"+ -+syn match nixAttr "\w\+\ze\s*=" -+syn match nixFuncArg "\zs\w\+\ze\s*:" -+syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings -+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+ -+syn match nixEndOfLineComment "#.*$" -+ -+hi def link nixKeyword Keyword -+hi def link nixConditional Conditional -+hi def link nixBrace Special -+hi def link nixString String -+hi def link nixStringIndented String -+hi def link nixBuiltin Special -+hi def link nixStringParam Macro -+hi def link nixMultiLineComment Comment -+hi def link nixEndOfLineComment Comment -+hi def link nixAttr Identifier -+hi def link nixFuncArg Identifier -+ -+syn sync maxlines=20000 -+syn sync minlines=50000 -+ -+let b:current_syntax = "nix" -+ -+" thanks to domenkozar -+" scan backwards to find begining of multiline statements -+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500 -+syn sync ccomment nixStringIndented minlines=10 maxlines=500 -+syn sync ccomment nixString maxlines=10 -diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim -new file mode 100644 ---- /dev/null -+++ b/runtime/ftplugin/nix.vim -@@ -0,0 +1,2 @@ -+" Only do this when not done yet for this buffer -+if exists("b:did_ftplugin") -+ finish -+endif -+let b:did_ftplugin = 1 -+ -+" coding conventions -+setlocal shiftwidth=2 expandtab softtabstop=2 -+let b:undo_ftplugin = "setlocal sw< et< sts<" diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index d81fea5ea398..4de49524f82f 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.2"; + version = "2.4.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r"; + sha256 = "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 633a1d9bd6e6..5c6a4bab9306 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -116,7 +116,7 @@ mkDerivation rec { meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; - homepage = http://www.digikam.org; + homepage = https://www.digikam.org; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index f95370e39e72..4bc0e93a3b46 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -23,6 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; - homepage = http://dosage.rocks/; + homepage = https://dosage.rocks/; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index d034f5d64d93..a1ea88da84be 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = http://geeqie.sourceforge.net; maintainers = with maintainers; [ jfrankenau pSub ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix deleted file mode 100644 index 3802fff2ad21..000000000000 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf -, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff -, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libexif, gettext, xorg -, AppKit, Cocoa, gtk-mac-integration }: - -let - inherit (python2Packages) pygtk wrapPython python; -in stdenv.mkDerivation rec { - name = "gimp-${version}"; - version = "2.8.22"; - - # This declarations for `gimp-with-plugins` wrapper, - # (used for determining $out/lib/gimp/${majorVersion}/ paths) - majorVersion = "2.0"; - targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts"; - - src = fetchurl { - url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi"; - }; - - buildInputs = - [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo - freetype fontconfig lcms libpng libjpeg poppler libtiff webkit - libmng librsvg libwmf zlib libzip ghostscript aalib jasper - python pygtk libexif gettext xorg.libXpm - wrapPython - ] - ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; - - pythonPath = [ pygtk ]; - - postFixup = '' - wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/ - wrapProgram $out/bin/gimp \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; - - passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? - - #configureFlags = [ "--disable-print" ]; - - enableParallelBuilding = true; - - # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"; - - meta = { - description = "The GNU Image Manipulation Program"; - homepage = https://www.gimp.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix new file mode 100644 index 000000000000..2536367f6ceb --- /dev/null +++ b/pkgs/applications/graphics/gimp/default.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes +, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff +, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info +, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 +, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr +, AppKit, Cocoa, gtk-mac-integration }: + +let + inherit (python2Packages) pygtk wrapPython python; +in stdenv.mkDerivation rec { + name = "gimp-${version}"; + version = "2.10.0"; + + src = fetchurl { + url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2"; + sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z"; + }; + + patches = [ + # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=371482; + sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc"; + }) + + # fix absolute paths stored in configuration + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6; + sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris"; + }) + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df; + sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh"; + }) + + # fix pc file (needed e.g. for building plug-ins) + (fetchpatch { + url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe; + sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ]; + propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc + buildInputs = [ + babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev + freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr + libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp + python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes + ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; + + pythonPath = [ pygtk ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}"; + + preConfigure = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/ + wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `gimp-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "${stdenv.lib.versions.major version}.0"; + targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; + targetScriptDir = "lib/gimp/${majorVersion}/scripts"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + ]; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "The GNU Image Manipulation Program"; + homepage = https://www.gimp.org/; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0d4215dd5bc2..5b21b349764b 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -12,12 +12,12 @@ let prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p ${targetScriptDir}; - for p in "$@"; do cp "$p" ${targetScriptDir}; done + mkdir -p $out/${targetScriptDir}; + for p in "$@"; do cp "$p" $out/${targetScriptDir}; done } installPlugins(){ - mkdir -p ${targetPluginDir}; - for p in "$@"; do cp "$p" ${targetPluginDir}; done + mkdir -p $out/${targetPluginDir}; + for p in "$@"; do cp "$p" $out/${targetPluginDir}; done } ''; } @@ -35,15 +35,6 @@ let installPhase = "installScripts ${src}"; }; - libLQR = pluginDerivation { - name = "liblqr-1-0.4.1"; - # required by lqrPlugin, you don't havet to install this lib explicitely - src = fetchurl { - url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; - }; - }; - in rec { gap = pluginDerivation { @@ -52,7 +43,7 @@ rec { */ name = "gap-2.6.0"; src = fetchurl { - url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; patchPhase = '' @@ -62,7 +53,7 @@ rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; - homepage = http://www.gimp.org; + homepage = https://www.gimp.org; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". license = with licenses; [ gpl3 free ]; @@ -97,6 +88,7 @@ rec { url = "http://registry.gimp.org/files/${name}.tar.bz2"; sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h"; }; + meta.broken = true; }; resynthesizer = pluginDerivation { @@ -147,6 +139,7 @@ rec { sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw"; }; installPhase = "installPlugins src/texturize"; + meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1 }; waveletSharpen = pluginDerivation { @@ -166,54 +159,18 @@ rec { Layer/Liquid Rescale */ name = "lqr-plugin-0.6.1"; - buildInputs = with pkgs; [ libLQR ]; + buildInputs = with pkgs; [ liblqr1 ]; src = fetchurl { url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"''; + #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; installPhase = "installPlugins src/gimp-lqr-plugin"; }; - gmic = - pluginDerivation rec { - inherit (pkgs.gmic) name src meta; + gmic = pkgs.gmic.gimpPlugin; - buildInputs = with pkgs; [ fftw opencv curl ]; - - sourceRoot = "${name}/src"; - - buildFlags = "gimp"; - - installPhase = "installPlugins gmic_gimp"; - }; - - # this is more than a gimp plugin ! - # either load the raw image with gimp (and the import dialog will popup) - # or use the binary - ufraw = pluginDerivation rec { - name = "ufraw-0.19.2"; - buildInputs = with pkgs; [ gtkimageview lcms ]; - # --enable-mime - install mime files, see README for more information - # --enable-extras - build extra (dcraw, nikon-curve) executables - # --enable-dst-correction - enable DST correction for file timestamps. - # --enable-contrast - enable the contrast setting option. - # --enable-interp-none: enable 'None' interpolation (mostly for debugging). - # --with-lensfun: use the lensfun library - experimental feature, read this before using it. - # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build - # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window - configureFlags = "--enable-extras --enable-dst-correction --enable-contrast"; - - src = fetchurl { - url = "mirror://sourceforge/ufraw/${name}.tar.gz"; - sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk"; - }; - installPhase = " - installPlugins ufraw-gimp - mkdir -p $out/bin - cp ufraw $out/bin - "; - }; + ufraw = pkgs.ufraw.gimpPlugin; gimplensfun = pluginDerivation rec { version = "0.2.4"; @@ -239,7 +196,7 @@ rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; }; diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index 7455a69dde97..ec529519159b 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,9 +1,10 @@ { stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}: let -allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins); +allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); selectedPlugins = if plugins == null then allPlugins else plugins; extraArgs = map (x: x.wrapArgs or "") selectedPlugins; +versionBranch = stdenv.lib.versions.majorMinor gimp.version; in symlinkJoin { name = "gimp-with-plugins-${gimp.version}"; @@ -13,14 +14,14 @@ in symlinkJoin { buildInputs = [ makeWrapper ]; postBuild = '' - for each in gimp-2.8 gimp-console-2.8; do + for each in gimp-${versionBranch} gimp-console-${versionBranch}; do wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ ${toString extraArgs} done set +x for each in gimp gimp-console; do - ln -sf "$each-2.8" $out/bin/$each + ln -sf "$each-${versionBranch}" $out/bin/$each done ''; } diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 8df630d582cc..3d49452cbe62 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,15 +3,17 @@ stdenv.mkDerivation rec { name = "goxel-${version}"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9"; + sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17"; }; + patches = [ ./disable-imgui_ini.patch ]; + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch new file mode 100644 index 000000000000..9427d45487d4 --- /dev/null +++ b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch @@ -0,0 +1,13 @@ +diff --git a/src/gui.cpp b/src/gui.cpp +index 9b7236c..a8a11b2 100644 +--- a/src/gui.cpp ++++ b/src/gui.cpp +@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs) + ImGuiIO& io = ImGui::GetIO(); + io.DeltaTime = 1.0f/60.0f; + ++ io.IniFilename = NULL; ++ + io.KeyMap[ImGuiKey_Tab] = KEY_TAB; + io.KeyMap[ImGuiKey_LeftArrow] = KEY_LEFT; + io.KeyMap[ImGuiKey_RightArrow] = KEY_RIGHT; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 47452eb43e88..5978612fdf33 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,9 +2,16 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, potrace, cmake +, libvisio, libcdr, libexif, potrace, autoreconfHook +, intltool +, icu # Not needed for building with CMake +, lib }: +# Note that originally this Nix expression used CMake to build but +# this led to errors on MacOS of "Too many arguments". Inkscape +# supports autoconf and we will use this for now on. + let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); in @@ -17,41 +24,45 @@ stdenv.mkDerivation rec { sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6"; }; - unpackPhase = '' - cp $src ${name}.tar.bz2 - tar xvjf ${name}.tar.bz2 > /dev/null - cd ${name} - ''; - postPatch = '' patchShebangs share/extensions patchShebangs fix-roff-punct + # XXX: Not needed for CMake: + ${lib.optionalString (!stdenv.isDarwin) '' + patchShebangs share/filters + patchShebangs share/palettes + patchShebangs share/patterns + patchShebangs share/symbols + patchShebangs share/templates + ''} + # Python is used at run-time to execute scripts, e.g., those from # the "Effects" menu. substituteInPlace src/extension/implementation/script.cpp \ --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"' ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook intltool ]; buildInputs = [ perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif potrace cmake python2Env + libvisio libcdr libexif potrace python2Env icu ]; enableParallelBuilding = true; + preConfigure = '' + intltoolize -f + ''; + postInstall = '' # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape - install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview ''; - meta = with stdenv.lib; { + meta = with lib; { license = "GPL"; homepage = https://www.inkscape.org; description = "Vector graphics editor"; @@ -62,5 +73,6 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index ac67759c258c..2ff62cc9eef2 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 9ca90d2f5df3..719aca5096a5 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index d3edc40cbea2..4be7d230b5f4 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index ad02e1a80231..ca0f49e0c948 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null -, gimpSupport ? false, gimp_2_8 ? null +, gimpSupport ? false, gimp ? null }: -assert gimpSupport -> gimp_2_8 != null; +assert gimpSupport -> gimp != null; stdenv.mkDerivation rec { name = "xsane-0.999"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] ++ (if libusb != null then [libusb] else []) - ++ stdenv.lib.optional gimpSupport gimp_2_8; + ++ stdenv.lib.optional gimpSupport gimp; meta = { homepage = http://www.sane-project.org/; diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index bea4fe9b2c6c..1fb8d572e95b 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index ec7af8829073..395179ff70ae 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index fc8e7a62c2ba..50cd9485a3e8 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,6 +1,9 @@ { fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib +, withGimpPlugin ? true, gimp ? null , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: +assert withGimpPlugin -> gimp != null; + stdenv.mkDerivation rec { name = "ufraw-0.22"; @@ -10,10 +13,23 @@ stdenv.mkDerivation rec { sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp"; }; - buildInputs = - [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib - libjpeg libtiff cfitsio exiv2 lcms2 lensfun - ]; + outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin"; + + nativeBuildInputs = [ pkgconfig gettext ]; + buildInputs = [ + gtk2 gtkimageview bzip2 zlib + libjpeg libtiff cfitsio exiv2 lcms2 lensfun + ] ++ stdenv.lib.optional withGimpPlugin gimp; + + configureFlags = [ + "--enable-extras" + "--enable-dst-correction" + "--enable-contrast" + ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp"; + + postInstall = stdenv.lib.optionalString withGimpPlugin '' + moveToOutput "lib/gimp" "$gimpPlugin" + ''; meta = { homepage = http://ufraw.sourceforge.net/; @@ -33,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # needs GTK+ + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+ }; } diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index c655cadef400..5afd7a0237d0 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index c70b1029b791..545675ab1545 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { meta = { description = "An interactive drawing tool for X11"; homepage = http://xfig.org; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch index 91fd934b1ecc..4743c36c44d0 100644 --- a/pkgs/applications/kde/akonadi/akonadi-paths.patch +++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch @@ -1,8 +1,40 @@ -Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp -@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett +diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp +index 2e9f1acf4..ecc80afdc 100644 +--- a/src/akonadicontrol/agentmanager.cpp ++++ b/src/akonadicontrol/agentmanager.cpp +@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent) + mStorageController = new Akonadi::ProcessControl; + mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld + connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); +- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + + if (mAgentServerEnabled) { + mAgentServer = new Akonadi::ProcessControl; + connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); +- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); ++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); + } + + #ifndef QT_NO_DEBUG +diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp +index be1cc4afb..6d0c1d7e5 100644 +--- a/src/akonadicontrol/agentprocessinstance.cpp ++++ b/src/akonadicontrol/agentprocessinstance.cpp +@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo) + } else { + Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); + const QStringList arguments = QStringList() << executable << identifier(); +- const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher")); ++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); + mController->start(agentLauncherExec, arguments); + } + return true; +diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp +index a32e86602..48ea4e52e 100644 +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -10,7 +42,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp QString defaultCleanShutdownCommand; #ifndef Q_OS_WIN -@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett +@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings) #endif const bool defaultInternalServer = true; @@ -29,28 +61,28 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp - << QStringLiteral("/opt/local/lib/mysql5/bin") - << QStringLiteral("/opt/mysql/sbin"); - if (defaultServerPath.isEmpty()) { -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath); - } - -- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath); +- +- const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath); + const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN); if (!mysqladminPath.isEmpty()) { #ifndef Q_OS_WIN defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown") -@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett +@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings) #endif } -- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath); +- mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath); + mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB); qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath; -- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath); +- mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath); + mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK); qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath; mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool(); -@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett +@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -59,7 +91,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString(); settings.endGroup(); -@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings) // intentionally not namespaced as we are the only one in this db instance when using internal mode mDatabaseName = QStringLiteral("akonadi"); } @@ -69,7 +101,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath; -@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett +@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings) settings.setValue(QStringLiteral("Name"), mDatabaseName); settings.setValue(QStringLiteral("Host"), mHostName); settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -79,20 +111,20 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); settings.sync(); -@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer( +@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer() #endif // generate config file -- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf")); +- const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf")); + const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf"); - const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf")); + const QString localConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf")); const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf"); if (globalConfig.isEmpty()) { -Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp -+++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp -@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings +diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp +index 60e6272f2..ad7cefbfe 100644 +--- a/src/server/storage/dbconfigpostgresql.cpp ++++ b/src/server/storage/dbconfigpostgresql.cpp +@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings) // determine default settings depending on the driver QString defaultHostName; QString defaultOptions; @@ -100,7 +132,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp QString defaultInitDbPath; QString defaultPgData; -@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool(); if (mInternalServer) { @@ -130,14 +162,13 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp - } - } - postgresSearchPath.append(postgresVersionedSearchPaths); -- -- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath); -- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath); +- defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath); +- defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath); + defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB); defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc"))); defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data")); } -@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings +@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings) mUserName = settings.value(QStringLiteral("User")).toString(); mPassword = settings.value(QStringLiteral("Password")).toString(); mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString(); @@ -149,7 +180,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath; mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString(); if (mInternalServer && mInitDbPath.isEmpty()) { -@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings +@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings) settings.setValue(QStringLiteral("Port"), mHostPort); } settings.setValue(QStringLiteral("Options"), mConnectionOptions); @@ -157,35 +188,3 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath); settings.setValue(QStringLiteral("StartServer"), mInternalServer); settings.endGroup(); -Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp -@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A - } else { - Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher); - const QStringList arguments = QStringList() << executable << identifier(); -- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher")); -+ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher"); - mController->start(agentLauncherExec, arguments); - } - return true; -Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -=================================================================== ---- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp -+++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp -@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose, - mStorageController = new Akonadi::ProcessControl; - mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld - connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure); -- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - - if (mAgentServerEnabled) { - mAgentServer = new Akonadi::ProcessControl; - connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure); -- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); -+ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash); - } - - #ifndef QT_NO_DEBUG diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 36dd1773b39e..5870179b6c0b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -28,6 +28,7 @@ still shows most of the available features is in `./gwenview.nix`. { stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs, plasma5, attica, phonon, + okteta }: let @@ -107,7 +108,6 @@ let kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; khelpcenter = callPackage ./khelpcenter.nix {}; - kholidays = callPackage ./kholidays.nix {}; kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; @@ -152,7 +152,6 @@ let mbox-importer = callPackage ./mbox-importer.nix {}; messagelib = callPackage ./messagelib.nix {}; minuet = callPackage ./minuet.nix {}; - okteta = callPackage ./okteta.nix {}; okular = callPackage ./okular.nix {}; pimcommon = callPackage ./pimcommon.nix {}; pim-data-exporter = callPackage ./pim-data-exporter.nix {}; @@ -160,6 +159,9 @@ let print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; syndication = callPackage ./syndication.nix {}; + # Okteta was removed from kde applications and will now be released independently + # Lets keep an alias for compatibility reasons + inherit okteta; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 9ad488f63ab4..a2feeac7cd9f 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index f2fb6f4d8bbd..46832477cc60 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement, - kpimtextedit, + kpimtextedit, kcalutils }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit + akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/applications/kde/kholidays.nix deleted file mode 100644 index 352bec094922..000000000000 --- a/pkgs/applications/kde/kholidays.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - qtbase, qtdeclarative, qttools, -}: - -mkDerivation { - name = "kholidays"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtbase qtdeclarative qttools ]; - outputs = [ "out" "dev" ]; -} diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 5269941fa113..2847e312d00a 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -4,7 +4,7 @@ kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, - kwindowsystem, kxmlgui, qtscript + kwindowsystem, kxmlgui, qtscript, knewstuff }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty - kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript + kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 5f6f28c95b08..39fb232b3421 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -5,7 +5,7 @@ kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5, - qtdeclarative, qtsvg, threadweaver + qtdeclarative, qtsvg, threadweaver, kcrash }: mkDerivation { @@ -16,7 +16,7 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver + qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; meta = with lib; { homepage = http://www.kde.org; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 6deec6aaabb4..f036e8cf632c 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras + qtx11extras, knewstuff }: mkDerivation { @@ -14,6 +14,7 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor + knewstuff ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index d61784805e45..36c18a3f9979 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1691 +3,1699 @@ { akonadi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz"; - sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi"; - name = "akonadi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz"; + sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d"; + name = "akonadi-18.04.0.tar.xz"; }; }; akonadi-calendar = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz"; - sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a"; - name = "akonadi-calendar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz"; + sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna"; + name = "akonadi-calendar-18.04.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz"; - sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9"; - name = "akonadi-calendar-tools-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz"; + sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f"; + name = "akonadi-calendar-tools-18.04.0.tar.xz"; }; }; akonadiconsole = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz"; - sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b"; - name = "akonadiconsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz"; + sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz"; + name = "akonadiconsole-18.04.0.tar.xz"; }; }; akonadi-contacts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz"; - sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v"; - name = "akonadi-contacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz"; + sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2"; + name = "akonadi-contacts-18.04.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz"; - sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4"; - name = "akonadi-import-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz"; + sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19"; + name = "akonadi-import-wizard-18.04.0.tar.xz"; }; }; akonadi-mime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz"; - sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2"; - name = "akonadi-mime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz"; + sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw"; + name = "akonadi-mime-18.04.0.tar.xz"; }; }; akonadi-notes = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz"; - sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g"; - name = "akonadi-notes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz"; + sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v"; + name = "akonadi-notes-18.04.0.tar.xz"; }; }; akonadi-search = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz"; - sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x"; - name = "akonadi-search-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz"; + sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0"; + name = "akonadi-search-18.04.0.tar.xz"; }; }; akregator = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz"; - sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp"; - name = "akregator-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz"; + sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc"; + name = "akregator-18.04.0.tar.xz"; }; }; analitza = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz"; - sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw"; - name = "analitza-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz"; + sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2"; + name = "analitza-18.04.0.tar.xz"; }; }; ark = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz"; - sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi"; - name = "ark-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz"; + sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12"; + name = "ark-18.04.0.tar.xz"; }; }; artikulate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz"; - sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx"; - name = "artikulate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz"; + sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg"; + name = "artikulate-18.04.0.tar.xz"; }; }; audiocd-kio = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz"; - sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26"; - name = "audiocd-kio-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz"; + sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1"; + name = "audiocd-kio-18.04.0.tar.xz"; }; }; baloo-widgets = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz"; - sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h"; - name = "baloo-widgets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz"; + sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj"; + name = "baloo-widgets-18.04.0.tar.xz"; }; }; blinken = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz"; - sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0"; - name = "blinken-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz"; + sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9"; + name = "blinken-18.04.0.tar.xz"; }; }; bomber = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz"; - sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s"; - name = "bomber-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz"; + sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn"; + name = "bomber-18.04.0.tar.xz"; }; }; bovo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz"; - sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9"; - name = "bovo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz"; + sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500"; + name = "bovo-18.04.0.tar.xz"; }; }; calendarsupport = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz"; - sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84"; - name = "calendarsupport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz"; + sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r"; + name = "calendarsupport-18.04.0.tar.xz"; }; }; cantor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz"; - sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w"; - name = "cantor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz"; + sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151"; + name = "cantor-18.04.0.tar.xz"; }; }; cervisia = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz"; - sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr"; - name = "cervisia-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz"; + sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq"; + name = "cervisia-18.04.0.tar.xz"; }; }; dolphin = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz"; - sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20"; - name = "dolphin-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz"; + sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm"; + name = "dolphin-18.04.0.tar.xz"; }; }; dolphin-plugins = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz"; - sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf"; - name = "dolphin-plugins-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz"; + sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq"; + name = "dolphin-plugins-18.04.0.tar.xz"; }; }; dragon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz"; - sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4"; - name = "dragon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz"; + sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w"; + name = "dragon-18.04.0.tar.xz"; }; }; eventviews = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz"; - sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc"; - name = "eventviews-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz"; + sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3"; + name = "eventviews-18.04.0.tar.xz"; }; }; ffmpegthumbs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz"; - sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5"; - name = "ffmpegthumbs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz"; + sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6"; + name = "ffmpegthumbs-18.04.0.tar.xz"; }; }; filelight = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz"; - sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf"; - name = "filelight-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz"; + sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43"; + name = "filelight-18.04.0.tar.xz"; }; }; granatier = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz"; - sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x"; - name = "granatier-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz"; + sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33"; + name = "granatier-18.04.0.tar.xz"; }; }; grantlee-editor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz"; - sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4"; - name = "grantlee-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz"; + sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h"; + name = "grantlee-editor-18.04.0.tar.xz"; }; }; grantleetheme = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz"; - sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx"; - name = "grantleetheme-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz"; + sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03"; + name = "grantleetheme-18.04.0.tar.xz"; }; }; gwenview = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz"; - sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr"; - name = "gwenview-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz"; + sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5"; + name = "gwenview-18.04.0.tar.xz"; }; }; incidenceeditor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz"; - sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka"; - name = "incidenceeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz"; + sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4"; + name = "incidenceeditor-18.04.0.tar.xz"; }; }; juk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz"; - sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6"; - name = "juk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz"; + sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa"; + name = "juk-18.04.0.tar.xz"; }; }; k3b = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz"; - sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l"; - name = "k3b-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz"; + sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l"; + name = "k3b-18.04.0.tar.xz"; }; }; kaccounts-integration = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz"; - sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9"; - name = "kaccounts-integration-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz"; + sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09"; + name = "kaccounts-integration-18.04.0.tar.xz"; }; }; kaccounts-providers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz"; - sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5"; - name = "kaccounts-providers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz"; + sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia"; + name = "kaccounts-providers-18.04.0.tar.xz"; }; }; kaddressbook = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz"; - sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq"; - name = "kaddressbook-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz"; + sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir"; + name = "kaddressbook-18.04.0.tar.xz"; }; }; kajongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz"; - sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa"; - name = "kajongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz"; + sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5"; + name = "kajongg-18.04.0.tar.xz"; }; }; kalarm = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz"; - sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7"; - name = "kalarm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz"; + sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02"; + name = "kalarm-18.04.0.tar.xz"; }; }; kalarmcal = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz"; - sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km"; - name = "kalarmcal-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz"; + sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7"; + name = "kalarmcal-18.04.0.tar.xz"; }; }; kalgebra = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz"; - sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7"; - name = "kalgebra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz"; + sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6"; + name = "kalgebra-18.04.0.tar.xz"; }; }; kalzium = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz"; - sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h"; - name = "kalzium-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz"; + sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv"; + name = "kalzium-18.04.0.tar.xz"; }; }; kamera = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz"; - sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9"; - name = "kamera-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz"; + sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc"; + name = "kamera-18.04.0.tar.xz"; + }; + }; + kamoso = { + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz"; + sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk"; + name = "kamoso-18.04.0.tar.xz"; }; }; kanagram = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz"; - sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k"; - name = "kanagram-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz"; + sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc"; + name = "kanagram-18.04.0.tar.xz"; }; }; kapman = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz"; - sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z"; - name = "kapman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz"; + sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m"; + name = "kapman-18.04.0.tar.xz"; }; }; kapptemplate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz"; - sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3"; - name = "kapptemplate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz"; + sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp"; + name = "kapptemplate-18.04.0.tar.xz"; }; }; kate = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz"; - sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5"; - name = "kate-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz"; + sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5"; + name = "kate-18.04.0.tar.xz"; }; }; katomic = { - version = "17.12.3"; + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz"; + sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q"; + name = "katomic-18.04.0.tar.xz"; + }; + }; + kbackup = { + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz"; - sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl"; - name = "katomic-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz"; + sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q"; + name = "kbackup-18.04.0.tar.xz"; }; }; kblackbox = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz"; - sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm"; - name = "kblackbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz"; + sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx"; + name = "kblackbox-18.04.0.tar.xz"; }; }; kblocks = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz"; - sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2"; - name = "kblocks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz"; + sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar"; + name = "kblocks-18.04.0.tar.xz"; }; }; kblog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz"; - sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb"; - name = "kblog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz"; + sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs"; + name = "kblog-18.04.0.tar.xz"; }; }; kbounce = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz"; - sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw"; - name = "kbounce-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz"; + sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21"; + name = "kbounce-18.04.0.tar.xz"; }; }; kbreakout = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz"; - sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c"; - name = "kbreakout-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz"; + sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n"; + name = "kbreakout-18.04.0.tar.xz"; }; }; kbruch = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz"; - sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r"; - name = "kbruch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz"; + sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk"; + name = "kbruch-18.04.0.tar.xz"; }; }; kcachegrind = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz"; - sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd"; - name = "kcachegrind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz"; + sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0"; + name = "kcachegrind-18.04.0.tar.xz"; }; }; kcalc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz"; - sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j"; - name = "kcalc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz"; + sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d"; + name = "kcalc-18.04.0.tar.xz"; }; }; kcalcore = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz"; - sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z"; - name = "kcalcore-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz"; + sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m"; + name = "kcalcore-18.04.0.tar.xz"; }; }; kcalutils = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz"; - sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb"; - name = "kcalutils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz"; + sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1"; + name = "kcalutils-18.04.0.tar.xz"; }; }; kcharselect = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz"; - sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4"; - name = "kcharselect-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz"; + sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9"; + name = "kcharselect-18.04.0.tar.xz"; }; }; kcolorchooser = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz"; - sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl"; - name = "kcolorchooser-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz"; + sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn"; + name = "kcolorchooser-18.04.0.tar.xz"; }; }; kcontacts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz"; - sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl"; - name = "kcontacts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz"; + sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb"; + name = "kcontacts-18.04.0.tar.xz"; }; }; kcron = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz"; - sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf"; - name = "kcron-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz"; + sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18"; + name = "kcron-18.04.0.tar.xz"; }; }; kdav = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz"; - sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4"; - name = "kdav-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz"; + sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2"; + name = "kdav-18.04.0.tar.xz"; }; }; kdebugsettings = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz"; - sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr"; - name = "kdebugsettings-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz"; + sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g"; + name = "kdebugsettings-18.04.0.tar.xz"; }; }; kde-dev-scripts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz"; - sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554"; - name = "kde-dev-scripts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz"; + sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8"; + name = "kde-dev-scripts-18.04.0.tar.xz"; }; }; kde-dev-utils = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz"; - sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6"; - name = "kde-dev-utils-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz"; + sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci"; + name = "kde-dev-utils-18.04.0.tar.xz"; }; }; kdeedu-data = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz"; - sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr"; - name = "kdeedu-data-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz"; + sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q"; + name = "kdeedu-data-18.04.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz"; - sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j"; - name = "kdegraphics-mobipocket-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz"; + sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn"; + name = "kdegraphics-mobipocket-18.04.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz"; - sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4"; - name = "kdegraphics-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz"; + sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh"; + name = "kdegraphics-thumbnailers-18.04.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz"; - sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh"; - name = "kdenetwork-filesharing-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz"; + sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg"; + name = "kdenetwork-filesharing-18.04.0.tar.xz"; }; }; kdenlive = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz"; - sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp"; - name = "kdenlive-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz"; + sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah"; + name = "kdenlive-18.04.0.tar.xz"; }; }; kdepim-addons = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz"; - sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h"; - name = "kdepim-addons-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz"; + sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc"; + name = "kdepim-addons-18.04.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz"; - sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24"; - name = "kdepim-apps-libs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz"; + sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz"; + name = "kdepim-apps-libs-18.04.0.tar.xz"; }; }; kdepim-runtime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz"; - sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn"; - name = "kdepim-runtime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz"; + sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz"; + name = "kdepim-runtime-18.04.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz"; - sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa"; - name = "kdesdk-kioslaves-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz"; + sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h"; + name = "kdesdk-kioslaves-18.04.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz"; - sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci"; - name = "kdesdk-thumbnailers-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz"; + sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g"; + name = "kdesdk-thumbnailers-18.04.0.tar.xz"; }; }; kdf = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz"; - sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp"; - name = "kdf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz"; + sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv"; + name = "kdf-18.04.0.tar.xz"; }; }; kdialog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz"; - sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4"; - name = "kdialog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz"; + sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn"; + name = "kdialog-18.04.0.tar.xz"; }; }; kdiamond = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz"; - sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc"; - name = "kdiamond-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz"; + sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9"; + name = "kdiamond-18.04.0.tar.xz"; }; }; keditbookmarks = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz"; - sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya"; - name = "keditbookmarks-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz"; + sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7"; + name = "keditbookmarks-18.04.0.tar.xz"; }; }; kfind = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz"; - sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s"; - name = "kfind-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz"; + sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw"; + name = "kfind-18.04.0.tar.xz"; }; }; kfloppy = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz"; - sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p"; - name = "kfloppy-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz"; + sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj"; + name = "kfloppy-18.04.0.tar.xz"; }; }; kfourinline = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz"; - sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw"; - name = "kfourinline-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz"; + sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q"; + name = "kfourinline-18.04.0.tar.xz"; }; }; kgeography = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz"; - sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih"; - name = "kgeography-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz"; + sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v"; + name = "kgeography-18.04.0.tar.xz"; }; }; kget = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz"; - sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww"; - name = "kget-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz"; + sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx"; + name = "kget-18.04.0.tar.xz"; }; }; kgoldrunner = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz"; - sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx"; - name = "kgoldrunner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz"; + sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z"; + name = "kgoldrunner-18.04.0.tar.xz"; }; }; kgpg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz"; - sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp"; - name = "kgpg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz"; + sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78"; + name = "kgpg-18.04.0.tar.xz"; }; }; khangman = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz"; - sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk"; - name = "khangman-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz"; + sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c"; + name = "khangman-18.04.0.tar.xz"; }; }; khelpcenter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz"; - sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n"; - name = "khelpcenter-17.12.3.tar.xz"; - }; - }; - kholidays = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz"; - sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di"; - name = "kholidays-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz"; + sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr"; + name = "khelpcenter-18.04.0.tar.xz"; }; }; kidentitymanagement = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz"; - sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y"; - name = "kidentitymanagement-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz"; + sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw"; + name = "kidentitymanagement-18.04.0.tar.xz"; }; }; kig = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz"; - sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid"; - name = "kig-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz"; + sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3"; + name = "kig-18.04.0.tar.xz"; }; }; kigo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz"; - sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh"; - name = "kigo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz"; + sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp"; + name = "kigo-18.04.0.tar.xz"; }; }; killbots = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz"; - sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an"; - name = "killbots-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz"; + sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2"; + name = "killbots-18.04.0.tar.xz"; }; }; kimagemapeditor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz"; - sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn"; - name = "kimagemapeditor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz"; + sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br"; + name = "kimagemapeditor-18.04.0.tar.xz"; }; }; kimap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz"; - sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw"; - name = "kimap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz"; + sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by"; + name = "kimap-18.04.0.tar.xz"; }; }; kio-extras = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz"; - sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks"; - name = "kio-extras-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz"; + sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil"; + name = "kio-extras-18.04.0.tar.xz"; }; }; kiriki = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz"; - sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q"; - name = "kiriki-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz"; + sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf"; + name = "kiriki-18.04.0.tar.xz"; }; }; kiten = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz"; - sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5"; - name = "kiten-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz"; + sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah"; + name = "kiten-18.04.0.tar.xz"; }; }; kjumpingcube = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz"; - sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l"; - name = "kjumpingcube-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz"; + sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl"; + name = "kjumpingcube-18.04.0.tar.xz"; }; }; kldap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz"; - sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy"; - name = "kldap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz"; + sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9"; + name = "kldap-18.04.0.tar.xz"; }; }; kleopatra = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz"; - sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd"; - name = "kleopatra-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz"; + sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908"; + name = "kleopatra-18.04.0.tar.xz"; }; }; klettres = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz"; - sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0"; - name = "klettres-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz"; + sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3"; + name = "klettres-18.04.0.tar.xz"; }; }; klickety = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz"; - sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8"; - name = "klickety-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz"; + sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc"; + name = "klickety-18.04.0.tar.xz"; }; }; klines = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz"; - sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0"; - name = "klines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz"; + sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1"; + name = "klines-18.04.0.tar.xz"; }; }; kmag = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz"; - sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w"; - name = "kmag-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz"; + sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f"; + name = "kmag-18.04.0.tar.xz"; }; }; kmahjongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz"; - sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a"; - name = "kmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz"; + sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx"; + name = "kmahjongg-18.04.0.tar.xz"; }; }; kmail = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz"; - sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs"; - name = "kmail-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz"; + sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r"; + name = "kmail-18.04.0.tar.xz"; }; }; kmail-account-wizard = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz"; - sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx"; - name = "kmail-account-wizard-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz"; + sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp"; + name = "kmail-account-wizard-18.04.0.tar.xz"; }; }; kmailtransport = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz"; - sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0"; - name = "kmailtransport-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz"; + sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f"; + name = "kmailtransport-18.04.0.tar.xz"; }; }; kmbox = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz"; - sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm"; - name = "kmbox-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz"; + sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k"; + name = "kmbox-18.04.0.tar.xz"; }; }; kmime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz"; - sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm"; - name = "kmime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz"; + sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx"; + name = "kmime-18.04.0.tar.xz"; }; }; kmines = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz"; - sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9"; - name = "kmines-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz"; + sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705"; + name = "kmines-18.04.0.tar.xz"; }; }; kmix = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz"; - sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp"; - name = "kmix-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz"; + sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg"; + name = "kmix-18.04.0.tar.xz"; }; }; kmousetool = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz"; - sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z"; - name = "kmousetool-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz"; + sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7"; + name = "kmousetool-18.04.0.tar.xz"; }; }; kmouth = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz"; - sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n"; - name = "kmouth-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz"; + sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk"; + name = "kmouth-18.04.0.tar.xz"; }; }; kmplot = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz"; - sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9"; - name = "kmplot-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz"; + sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v"; + name = "kmplot-18.04.0.tar.xz"; }; }; knavalbattle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz"; - sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f"; - name = "knavalbattle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz"; + sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv"; + name = "knavalbattle-18.04.0.tar.xz"; }; }; knetwalk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz"; - sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k"; - name = "knetwalk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz"; + sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x"; + name = "knetwalk-18.04.0.tar.xz"; }; }; knotes = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz"; - sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3"; - name = "knotes-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz"; + sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh"; + name = "knotes-18.04.0.tar.xz"; }; }; kolf = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz"; - sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj"; - name = "kolf-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz"; + sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn"; + name = "kolf-18.04.0.tar.xz"; }; }; kollision = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz"; - sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz"; - name = "kollision-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz"; + sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i"; + name = "kollision-18.04.0.tar.xz"; }; }; kolourpaint = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz"; - sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w"; - name = "kolourpaint-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz"; + sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr"; + name = "kolourpaint-18.04.0.tar.xz"; }; }; kompare = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz"; - sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl"; - name = "kompare-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz"; + sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi"; + name = "kompare-18.04.0.tar.xz"; }; }; konqueror = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz"; - sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw"; - name = "konqueror-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz"; + sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2"; + name = "konqueror-18.04.0.tar.xz"; }; }; konquest = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz"; - sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli"; - name = "konquest-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz"; + sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx"; + name = "konquest-18.04.0.tar.xz"; }; }; konsole = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz"; - sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs"; - name = "konsole-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz"; + sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k"; + name = "konsole-18.04.0.tar.xz"; }; }; kontact = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz"; - sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas"; - name = "kontact-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz"; + sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz"; + name = "kontact-18.04.0.tar.xz"; }; }; kontactinterface = { - version = "17.12.3"; + version = "18.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz"; + sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x"; + name = "kontactinterface-18.04.0.tar.xz"; + }; + }; + kopete = { + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz"; - sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks"; - name = "kontactinterface-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz"; + sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl"; + name = "kopete-18.04.0.tar.xz"; }; }; korganizer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz"; - sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40"; - name = "korganizer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz"; + sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2"; + name = "korganizer-18.04.0.tar.xz"; }; }; kpat = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz"; - sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh"; - name = "kpat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz"; + sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728"; + name = "kpat-18.04.0.tar.xz"; }; }; kpimtextedit = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz"; - sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c"; - name = "kpimtextedit-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz"; + sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68"; + name = "kpimtextedit-18.04.0.tar.xz"; }; }; kqtquickcharts = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz"; - sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0"; - name = "kqtquickcharts-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz"; + sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8"; + name = "kqtquickcharts-18.04.0.tar.xz"; }; }; krdc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz"; - sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps"; - name = "krdc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz"; + sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9"; + name = "krdc-18.04.0.tar.xz"; }; }; kreversi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz"; - sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg"; - name = "kreversi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz"; + sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8"; + name = "kreversi-18.04.0.tar.xz"; }; }; krfb = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz"; - sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv"; - name = "krfb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz"; + sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc"; + name = "krfb-18.04.0.tar.xz"; }; }; kross-interpreters = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz"; - sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s"; - name = "kross-interpreters-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz"; + sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y"; + name = "kross-interpreters-18.04.0.tar.xz"; }; }; kruler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz"; - sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa"; - name = "kruler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz"; + sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr"; + name = "kruler-18.04.0.tar.xz"; }; }; kshisen = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz"; - sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0"; - name = "kshisen-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz"; + sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf"; + name = "kshisen-18.04.0.tar.xz"; }; }; ksirk = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz"; - sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz"; - name = "ksirk-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz"; + sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8"; + name = "ksirk-18.04.0.tar.xz"; }; }; ksmtp = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz"; - sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b"; - name = "ksmtp-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz"; + sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn"; + name = "ksmtp-18.04.0.tar.xz"; }; }; ksnakeduel = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz"; - sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy"; - name = "ksnakeduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz"; + sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w"; + name = "ksnakeduel-18.04.0.tar.xz"; }; }; kspaceduel = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz"; - sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6"; - name = "kspaceduel-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz"; + sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i"; + name = "kspaceduel-18.04.0.tar.xz"; }; }; ksquares = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz"; - sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667"; - name = "ksquares-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz"; + sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn"; + name = "ksquares-18.04.0.tar.xz"; }; }; ksudoku = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz"; - sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n"; - name = "ksudoku-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz"; + sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3"; + name = "ksudoku-18.04.0.tar.xz"; }; }; ksystemlog = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz"; - sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr"; - name = "ksystemlog-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz"; + sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780"; + name = "ksystemlog-18.04.0.tar.xz"; }; }; kteatime = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz"; - sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz"; - name = "kteatime-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz"; + sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3"; + name = "kteatime-18.04.0.tar.xz"; }; }; ktimer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz"; - sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x"; - name = "ktimer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz"; + sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj"; + name = "ktimer-18.04.0.tar.xz"; }; }; ktnef = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz"; - sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n"; - name = "ktnef-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz"; + sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36"; + name = "ktnef-18.04.0.tar.xz"; }; }; ktouch = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz"; - sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795"; - name = "ktouch-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz"; + sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v"; + name = "ktouch-18.04.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz"; - sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm"; - name = "ktp-accounts-kcm-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz"; + sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s"; + name = "ktp-accounts-kcm-18.04.0.tar.xz"; }; }; ktp-approver = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz"; - sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp"; - name = "ktp-approver-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz"; + sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4"; + name = "ktp-approver-18.04.0.tar.xz"; }; }; ktp-auth-handler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz"; - sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21"; - name = "ktp-auth-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz"; + sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y"; + name = "ktp-auth-handler-18.04.0.tar.xz"; }; }; ktp-call-ui = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz"; - sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m"; - name = "ktp-call-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz"; + sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm"; + name = "ktp-call-ui-18.04.0.tar.xz"; }; }; ktp-common-internals = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz"; - sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80"; - name = "ktp-common-internals-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz"; + sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av"; + name = "ktp-common-internals-18.04.0.tar.xz"; }; }; ktp-contact-list = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz"; - sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb"; - name = "ktp-contact-list-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz"; + sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y"; + name = "ktp-contact-list-18.04.0.tar.xz"; }; }; ktp-contact-runner = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz"; - sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq"; - name = "ktp-contact-runner-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz"; + sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli"; + name = "ktp-contact-runner-18.04.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz"; - sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj"; - name = "ktp-desktop-applets-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz"; + sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji"; + name = "ktp-desktop-applets-18.04.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz"; - sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8"; - name = "ktp-filetransfer-handler-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz"; + sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5"; + name = "ktp-filetransfer-handler-18.04.0.tar.xz"; }; }; ktp-kded-module = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz"; - sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp"; - name = "ktp-kded-module-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz"; + sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj"; + name = "ktp-kded-module-18.04.0.tar.xz"; }; }; ktp-send-file = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz"; - sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch"; - name = "ktp-send-file-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz"; + sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l"; + name = "ktp-send-file-18.04.0.tar.xz"; }; }; ktp-text-ui = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz"; - sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v"; - name = "ktp-text-ui-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz"; + sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km"; + name = "ktp-text-ui-18.04.0.tar.xz"; }; }; ktuberling = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz"; - sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4"; - name = "ktuberling-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz"; + sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d"; + name = "ktuberling-18.04.0.tar.xz"; }; }; kturtle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz"; - sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8"; - name = "kturtle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz"; + sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62"; + name = "kturtle-18.04.0.tar.xz"; }; }; kubrick = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz"; - sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp"; - name = "kubrick-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz"; + sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy"; + name = "kubrick-18.04.0.tar.xz"; }; }; kwalletmanager = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz"; - sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1"; - name = "kwalletmanager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz"; + sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q"; + name = "kwalletmanager-18.04.0.tar.xz"; }; }; kwave = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz"; - sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng"; - name = "kwave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz"; + sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53"; + name = "kwave-18.04.0.tar.xz"; }; }; kwordquiz = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz"; - sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx"; - name = "kwordquiz-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz"; + sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y"; + name = "kwordquiz-18.04.0.tar.xz"; }; }; libgravatar = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz"; - sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm"; - name = "libgravatar-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz"; + sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1"; + name = "libgravatar-18.04.0.tar.xz"; }; }; libkcddb = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz"; - sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi"; - name = "libkcddb-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz"; + sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa"; + name = "libkcddb-18.04.0.tar.xz"; }; }; libkcompactdisc = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz"; - sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v"; - name = "libkcompactdisc-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz"; + sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb"; + name = "libkcompactdisc-18.04.0.tar.xz"; }; }; libkdcraw = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz"; - sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc"; - name = "libkdcraw-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz"; + sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik"; + name = "libkdcraw-18.04.0.tar.xz"; }; }; libkdegames = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz"; - sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd"; - name = "libkdegames-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz"; + sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6"; + name = "libkdegames-18.04.0.tar.xz"; }; }; libkdepim = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz"; - sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q"; - name = "libkdepim-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz"; + sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq"; + name = "libkdepim-18.04.0.tar.xz"; }; }; libkeduvocdocument = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz"; - sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v"; - name = "libkeduvocdocument-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz"; + sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw"; + name = "libkeduvocdocument-18.04.0.tar.xz"; }; }; libkexiv2 = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz"; - sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg"; - name = "libkexiv2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz"; + sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy"; + name = "libkexiv2-18.04.0.tar.xz"; }; }; libkgapi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz"; - sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y"; - name = "libkgapi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz"; + sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli"; + name = "libkgapi-18.04.0.tar.xz"; }; }; libkgeomap = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz"; - sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi"; - name = "libkgeomap-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz"; + sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh"; + name = "libkgeomap-18.04.0.tar.xz"; }; }; libkipi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz"; - sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq"; - name = "libkipi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz"; + sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb"; + name = "libkipi-18.04.0.tar.xz"; }; }; libkleo = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz"; - sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k"; - name = "libkleo-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz"; + sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd"; + name = "libkleo-18.04.0.tar.xz"; }; }; libkmahjongg = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz"; - sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd"; - name = "libkmahjongg-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz"; + sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k"; + name = "libkmahjongg-18.04.0.tar.xz"; }; }; libkomparediff2 = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz"; - sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l"; - name = "libkomparediff2-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz"; + sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy"; + name = "libkomparediff2-18.04.0.tar.xz"; }; }; libksane = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz"; - sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2"; - name = "libksane-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz"; + sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i"; + name = "libksane-18.04.0.tar.xz"; }; }; libksieve = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz"; - sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433"; - name = "libksieve-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz"; + sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn"; + name = "libksieve-18.04.0.tar.xz"; }; }; lokalize = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz"; - sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9"; - name = "lokalize-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz"; + sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4"; + name = "lokalize-18.04.0.tar.xz"; }; }; lskat = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz"; - sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0"; - name = "lskat-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz"; + sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7"; + name = "lskat-18.04.0.tar.xz"; }; }; mailcommon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz"; - sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f"; - name = "mailcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz"; + sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd"; + name = "mailcommon-18.04.0.tar.xz"; }; }; mailimporter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz"; - sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc"; - name = "mailimporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz"; + sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi"; + name = "mailimporter-18.04.0.tar.xz"; }; }; marble = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz"; - sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i"; - name = "marble-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz"; + sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv"; + name = "marble-18.04.0.tar.xz"; }; }; mbox-importer = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz"; - sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp"; - name = "mbox-importer-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz"; + sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5"; + name = "mbox-importer-18.04.0.tar.xz"; }; }; messagelib = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz"; - sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald"; - name = "messagelib-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz"; + sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2"; + name = "messagelib-18.04.0.tar.xz"; }; }; minuet = { - version = "17.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz"; - sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b"; - name = "minuet-17.12.3.tar.xz"; - }; - }; - okteta = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz"; - sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"; - name = "okteta-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz"; + sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh"; + name = "minuet-18.04.0.tar.xz"; }; }; okular = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz"; - sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha"; - name = "okular-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz"; + sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8"; + name = "okular-18.04.0.tar.xz"; }; }; palapeli = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz"; - sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln"; - name = "palapeli-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz"; + sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b"; + name = "palapeli-18.04.0.tar.xz"; }; }; parley = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz"; - sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6"; - name = "parley-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz"; + sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if"; + name = "parley-18.04.0.tar.xz"; }; }; picmi = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz"; - sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn"; - name = "picmi-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz"; + sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r"; + name = "picmi-18.04.0.tar.xz"; }; }; pimcommon = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz"; - sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq"; - name = "pimcommon-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz"; + sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp"; + name = "pimcommon-18.04.0.tar.xz"; }; }; pim-data-exporter = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz"; - sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b"; - name = "pim-data-exporter-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz"; + sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7"; + name = "pim-data-exporter-18.04.0.tar.xz"; }; }; pim-sieve-editor = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz"; - sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp"; - name = "pim-sieve-editor-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz"; + sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a"; + name = "pim-sieve-editor-18.04.0.tar.xz"; }; }; poxml = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz"; - sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp"; - name = "poxml-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz"; + sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv"; + name = "poxml-18.04.0.tar.xz"; }; }; print-manager = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz"; - sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7"; - name = "print-manager-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz"; + sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx"; + name = "print-manager-18.04.0.tar.xz"; }; }; rocs = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz"; - sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46"; - name = "rocs-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz"; + sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4"; + name = "rocs-18.04.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz"; - sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m"; - name = "signon-kwallet-extension-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz"; + sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0"; + name = "signon-kwallet-extension-18.04.0.tar.xz"; }; }; spectacle = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz"; - sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr"; - name = "spectacle-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz"; + sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2"; + name = "spectacle-18.04.0.tar.xz"; }; }; step = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz"; - sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v"; - name = "step-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz"; + sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4"; + name = "step-18.04.0.tar.xz"; }; }; svgpart = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz"; - sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5"; - name = "svgpart-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz"; + sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp"; + name = "svgpart-18.04.0.tar.xz"; }; }; sweeper = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz"; - sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x"; - name = "sweeper-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz"; + sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331"; + name = "sweeper-18.04.0.tar.xz"; }; }; syndication = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz"; - sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808"; - name = "syndication-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz"; + sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n"; + name = "syndication-18.04.0.tar.xz"; }; }; umbrello = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz"; - sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0"; - name = "umbrello-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz"; + sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp"; + name = "umbrello-18.04.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.12.3"; + version = "18.04.0"; src = fetchurl { - url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz"; - sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i"; - name = "zeroconf-ioslave-17.12.3.tar.xz"; + url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz"; + sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22"; + name = "zeroconf-ioslave-18.04.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch index 4d37c3b642f5..faaaf2c19949 100644 --- a/pkgs/applications/misc/calibre/no_updates_dialog.patch +++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch @@ -13,15 +13,3 @@ diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre parser.add_option('--ignore-plugins', default=False, action='store_true', help=_('Ignore custom plugins, useful if you installed a plugin' ' that is preventing calibre from starting')) -diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py ---- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800 -+++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800 -@@ -154,6 +154,8 @@ - self.update_checker.signal.update_found.connect(self.update_found, - type=Qt.QueuedConnection) - self.update_checker.start() -+ else: -+ self.update_checker = None - - def recalc_update_label(self, number_of_plugin_updates): - self.update_found(self.last_newest_calibre_version, number_of_plugin_updates) diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 22d659dd10e4..b8fc63c2c9ed 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20180412"; src = fetchurl { - url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; + url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = http://chirp.danplanet.com/; + homepage = https://chirp.danplanet.com/; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 002d8fc8f23b..edc1497294fc 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.0.3"; + version = "5.0.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581"; + sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3"; }; installPhase = '' diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 67bb5feff8c7..f3f7fe2aacba 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.gnu.org/software/gcal/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index d3ba5a97333a..6a7a7ae604de 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,7 +1,38 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages +{ stdenv, lib, fetchFromGitHub, python2 , libnotify ? null }: -pythonPackages.buildPythonApplication rec { +let + py = python2.override { + packageOverrides = self: super: { + google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec { + version = "1.5.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig"; + }; + }); + + oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec { + version = "1.4.12"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + }; + }); + + uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec { + version = "0.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3"; + }; + # there are no checks in this version + doCheck = false; + }); + }; + }; + +in with py.pkgs; buildPythonApplication rec { version = "3.4.0"; name = "gcalcli-${version}"; @@ -12,27 +43,21 @@ pythonPackages.buildPythonApplication rec { sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; }; - propagatedBuildInputs = with pythonPackages; [ - dateutil - gflags - google_api_python_client - httplib2 - oauth2client - parsedatetime - six - vobject - ] - ++ lib.optional (!pythonPackages.isPy3k) futures; - - # there are no tests as of 3.4.0 - doCheck = false; + propagatedBuildInputs = [ + dateutil gflags httplib2 parsedatetime six vobject + # overridden + google_api_python_client oauth2client uritemplate + ] ++ lib.optional (!isPy3k) futures; postInstall = lib.optionalString stdenv.isLinux '' - substituteInPlace $out/bin/gcalcli \ - --replace "command = 'notify-send -u critical -a gcalcli %s'" \ - "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" + substituteInPlace $out/bin/gcalcli --replace \ + "command = 'notify-send -u critical -a gcalcli %s'" \ + "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" ''; + # There are no tests as of 3.4.0 + doCheck = false; + meta = with lib; { homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index ef805a31567a..149092c70d38 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Graphical user interface for the GnuPG"; homepage = https://www.gnupg.org/related_software/gpa/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 5f219dc4752c..50f575d15cec 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -51,7 +51,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Genealogy software"; - homepage = http://gramps-project.org; + homepage = https://gramps-project.org; license = licenses.gpl2; }; } diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 17837c6c254e..c34f0e48f3ec 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -2,7 +2,7 @@ , gtk3, keybinder3, libnotify, libutempter, vte }: let - version = "3.2.0"; + version = "3.2.1"; in python3.pkgs.buildPythonApplication rec { name = "guake-${version}"; format = "other"; @@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec { owner = "Guake"; repo = "guake"; rev = version; - sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d"; + sha256 = "0qzrkmjizpc3kirvhml62wya1sr3pbig25nfcrfhk1hhr3jxq17s"; }; nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ]; @@ -24,6 +24,12 @@ in python3.pkgs.buildPythonApplication rec { PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var + postPatch = '' + # unnecessary /usr/bin/env in Makefile + # https://github.com/Guake/guake/pull/1285 + substituteInPlace "Makefile" --replace "/usr/bin/env python3" "python3" + ''; + makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index 2efd0ee969f1..af7d257eed6e 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/opt/ipmicfg" cp Linux/64bit/* "$out/opt/ipmicfg" - patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \ + patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \ + "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg" ''; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 52f1c9fb1a1d..496353325255 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -5,7 +5,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.8.2"; + version = "0.9.0"; name = "kitty-${version}"; format = "other"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c"; + sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8"; }; buildInputs = [ diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 36527cdbe7c3..662ca9761fb2 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -15,7 +15,7 @@ let then rec { version = "0.9.9.4"; src = fetchurl { - url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; + url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; }; } @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; - homepage = http://lilyterm.luna.com.tw/; + homepage = https://lilyterm.luna.com.tw/; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 5ea49f28afd8..525be09d9686 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,52 +1,42 @@ -{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }: - let - version = "4.3.89"; - in - stdenv.mkDerivation { - name = "masterpdfeditor-${version}"; - src = fetchurl { - url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; - }; - libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc - glibc - sane-backends - qtbase - qtsvg - libXext - libX11 - libXdmcp - libXau - libxcb - ]; - dontStrip = true; - installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps - - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications - - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p - - install -D license.txt $out/share/$name/LICENSE - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - $p/masterpdfeditor4 - ''; - meta = with stdenv.lib; { - description = "Master PDF Editor"; - homepage = "https://code-industry.net/free-pdf-editor/"; - license = licenses.unfreeRedistributable; - platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; - }; - } +{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }: +let + version = "4.3.89"; +in stdenv.mkDerivation { + name = "masterpdfeditor-${version}"; + src = fetchurl { + url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ sane-backends qtbase qtsvg ]; + + dontStrip = true; + + installPhase = '' + p=$out/opt/masterpdfeditor + mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + + substituteInPlace masterpdfeditor4.desktop \ + --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" + cp -v masterpdfeditor4.png $out/share/pixmaps/ + cp -v masterpdfeditor4.desktop $out/share/applications + + cp -v masterpdfeditor4 $p/ + ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 + cp -v -r stamps templates lang fonts $p + + install -D license.txt $out/share/$name/LICENSE + ''; + + meta = with stdenv.lib; { + description = "Master PDF Editor"; + homepage = "https://code-industry.net/free-pdf-editor/"; + license = licenses.unfreeRedistributable; + platforms = with platforms; [ "x86_64-linux" ]; + maintainers = with maintainers; [ cmcdragonkai flokli ]; + }; +} diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 02c18109abc2..67e6ed3fa9ce 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.4"; + version = "0.7.5"; name = "mwic-${version}"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz"; - sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q"; + sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc"; }; makeFlags=["PREFIX=\${out}"]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index d4847e4ce493..de64705d832b 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -88,6 +88,7 @@ in python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ glibcLocales + gobjectIntrospection # populate GI_TYPELIB_PATH intltool pkgconfig ]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix new file mode 100644 index 000000000000..c567a7903b81 --- /dev/null +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}: + +pythonPackages.buildPythonApplication rec { + name = "pdf-quench-${version}"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "linuxerwang"; + repo = "pdf-quench"; + rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6"; + sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = with pkgs; [ + gtk3 + gobjectIntrospection + goocanvas2 + poppler_gi + ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ]; + + format = "other"; + doCheck = false; + + installPhase = '' + install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/linuxerwang/pdf-quench; + description = "A visual tool for cropping pdf files"; + platforms = platforms.linux; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index e3e7ff950b0c..f836ce5b8085 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups +{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,9 +10,9 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - qt4 poppler_qt4 djvulibre libspectre cups file ghostscript + qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript ]; in stdenv.mkDerivation { @@ -21,13 +21,12 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - configurePhase = '' - qmake *.pro - for i in *.pro; do - qmake "$i" -o "Makefile.$(basename "$i" .pro)" - done - sed -e "s@/usr/@$out/@g" -i Makefile* + + # TODO: revert this once placeholder is supported + preConfigure = '' + qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata" ''; + meta = { inherit (s) version; description = "A tabbed document viewer"; diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 37d7aeb88e61..40a399247e90 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; maintainers = with pkgs.lib.maintainers; [ ]; - platforms = pkgs.lib.platforms.linux; + platforms = pkgs.lib.platforms.all; license = pkgs.lib.licenses.gpl3; }; } diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 42d9e448991a..88adbfff3b9a 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c"; + sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix new file mode 100644 index 000000000000..cadf5ccb6a48 --- /dev/null +++ b/pkgs/applications/misc/yarssr/default.nix @@ -0,0 +1,68 @@ +{ +fetchFromGitHub, stdenv, lib, +autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs, +perl, perlPackages, +gnome2 }: + +let + perlDeps = with perlPackages; [ + Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon + XMLLibXML XMLSAXBase XMLParser XMLRSS + HTMLParser + DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone + ParamsValidate + ModuleImplementation ModuleRuntime + TryTiny + ClassSingleton + URI + AnyEvent AnyEventHTTP + CommonSense + FileSlurp + JSON + Guard + LocaleGettext + ]; + libs = [ + stdenv.cc.cc.lib + pkgs.gtk2 + ]; +in +stdenv.mkDerivation rec { + version = "git-2017-12-01"; + name = "yarssr-${version}"; + + src = fetchFromGitHub { + owner = "JGRennison"; + repo = "yarssr"; + rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; + sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; + }; + + nativeBuildInputs = [ perl pkgs.gettext makeWrapper ]; + buildInputs = perlDeps ++ [gnome2.libglade]; + propagatedBuildInputs = libs ++ perlDeps; + + installPhase = '' + DESTDIR=$out make install + mv $out/usr/* $out/ + rm -R $out/usr + sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr + sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr + sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm + chmod a+x $out/bin/yarssr + ''; + + postFixup = '' + wrapProgram $out/bin/yarssr \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ + --set PERL5LIB "${lib.makePerlPath perlDeps}" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tsyrogit/zxcvbn-c; + description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; + license = licenses.gpl1; + platforms = platforms.linux; + maintainers = with maintainers; [ xurei ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index e35d894e0e7e..cca26b541240 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -51,5 +51,6 @@ mkChromiumDerivation (base: rec { license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 86400; # 24 hours }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b591d5d7ba0c..6403f5441f36 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -160,8 +160,9 @@ let sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z"; }) ] ++ optional enableWideVine ./patches/widevine.patch - ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [ + ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [ ./patches/skia_buildfix.patch + ./patches/neon_buildfix.patch ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch new file mode 100644 index 000000000000..b44487ca634c --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch @@ -0,0 +1,21 @@ +diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc +index 26b91b9..cae6bc2 100644 +--- a/skia/ext/convolver_neon.cc ++++ b/skia/ext/convolver_neon.cc + +@@ -23,7 +23,7 @@ + remainder[2] += coeff * pixels_left[i * 4 + 2]; + remainder[3] += coeff * pixels_left[i * 4 + 3]; + } +- return {remainder[0], remainder[1], remainder[2], remainder[3]}; ++ return vld1q_s32(remainder); + } + + // Convolves horizontally along a single row. The row data is given in +@@ -336,4 +336,4 @@ + } + } + +-} // namespace skia +\ No newline at end of file ++} // namespace skia diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8a8abb42f55e..a2094305db55 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\$XAUTHORITY" \ + XAUTHORITY="\''${XAUTHORITY:-}" \ DISPLAY="\$DISPLAY" \ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ \ diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 2b5554353270..1a7ba3cf93df 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; - homepage = http://kubernetes.io; + homepage = https://kubernetes.io; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix new file mode 100644 index 000000000000..9764e029d277 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +# +# USAGE: +# install the following package globally or in nix-shell: +# +# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) +# +# examples: +# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples +# + +buildGoPackage rec { + name = "terraform-provider-ibm-${version}"; + version = "0.8.0"; + + goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; + subPackages = [ "./" ]; + + src = fetchFromGitHub { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; + description = "Terraform provider is used to manage IBM Cloud resources."; + platforms = platforms.all; + license = licenses.mpl20; + maintainers = with maintainers; [ jensbin ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 0a0b20bfd15d..7aed4b95dd45 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,8 +4,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.0"; - sha256 = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv"; + version = "1.9.1"; + sha256 = "11rsvzyc74v14n7g0z1mwyykaz7m6bmvi38jx711b6vpxvm2scva"; }; archive = { @@ -32,8 +32,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.13.0"; - sha256 = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny"; + version = "1.16.0"; + sha256 = "0knivwxdjkxyaqka0vvn0lh2ndbg660dw2g03iw00fx6ska1zn0c"; }; azure-classic = { @@ -46,8 +46,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.3.1"; - sha256 = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4"; + version = "1.4.0"; + sha256 = "0g1i1aasi44zn5bdivzqkk1kshq271x2lydjskyqq7jfx27myibb"; }; bitbucket = { @@ -81,22 +81,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "0.1.0"; - sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq"; + version = "1.0.0"; + sha256 = "1ar9wcgr45f2v6bqjn24zii0qwfppla8ya3gjc546sh1a7m0h9p3"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - version = "1.0.0"; - sha256 = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz"; + version = "1.0.1"; + sha256 = "0lhzwbm1a2s11s0ahb3vxfvshh385fgy1ficvip4rl31dahhwrav"; }; cloudstack = { owner = "terraform-providers"; repo = "terraform-provider-cloudstack"; - version = "0.1.4"; - sha256 = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa"; + version = "0.1.5"; + sha256 = "139wq6rr6fczjz496fqkxh6cmscx5hfnv2hvhfwpkhvqipsnlxmq"; }; cobbler = { @@ -193,15 +193,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.8.0"; - sha256 = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh"; + version = "1.10.0"; + sha256 = "08ayi30aqw9lz8qn982vl9m3z4prah60fqq2q9hvscf6qb9g8lr0"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.0.1"; - sha256 = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns"; + version = "1.0.2"; + sha256 = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i"; }; heroku = { @@ -263,8 +263,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-logentries"; - version = "0.1.0"; - sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa"; + version = "1.0.0"; + sha256 = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq"; }; logicmonitor = { @@ -308,6 +308,13 @@ version = "1.0.0"; sha256 = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5"; }; + nsxt = + { + owner = "terraform-providers"; + repo = "terraform-provider-nsxt"; + version = "1.0.0"; + sha256 = "09yliw59wp9flfgmkznbf4syl510wpxsplzr8sa9m2vw0yc78jnq"; + }; null = { owner = "terraform-providers"; @@ -368,22 +375,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - version = "1.2.0"; - sha256 = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4"; + version = "1.2.3"; + sha256 = "0vx2pvrxgpy137v3i563w0sdqqrqp6p6sls27fg76cfxrqik5dpk"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.0.0"; - sha256 = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa"; + version = "1.1.0"; + sha256 = "100zxmpgd5qbzivkc2ja75980yrlz0k50x7448wf1kp2inyylxq0"; }; panos = { owner = "terraform-providers"; repo = "terraform-provider-panos"; - version = "1.0.0"; - sha256 = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76"; + version = "1.1.0"; + sha256 = "1j3j0bdblw54g2l4xdwm9604n3qfb6zb4b8p081hs5nv004awka4"; }; postgresql = { @@ -424,8 +431,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-random"; - version = "1.1.0"; - sha256 = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl"; + version = "1.2.0"; + sha256 = "00gzqav21h2x2spczwcddlwl0llhgy03djvjjq9g9wb5yvcf4yll"; }; rundeck = { @@ -438,8 +445,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.2.0"; - sha256 = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v"; + version = "1.3.0"; + sha256 = "1yd2xdr52z0f3ykfhsfgf57zzhjglci8mvbimdf6z8xmdgfhwjbf"; }; softlayer = { @@ -487,8 +494,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-triton"; - version = "0.4.2"; - sha256 = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml"; + version = "0.5.0"; + sha256 = "1cbv4bliswiwbhr9bh2m4faazhj0v89jnwn0fndfjw3rka1b97h7"; }; ultradns = { @@ -501,8 +508,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.0.0"; - sha256 = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw"; + version = "1.1.0"; + sha256 = "1g0cca662glqcz83l1skhj3nb7g386x65kwz95kyp59nvyxywvbq"; }; vcd = { @@ -515,7 +522,7 @@ { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - version = "1.3.3"; - sha256 = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7"; + version = "1.4.1"; + sha256 = "16dgszmcsfzbflqg053av1v8wgwy8m6f2qlk55fg3ww1a59c0wy1"; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index e3a917a12eb3..ff19a62ef306 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = http://www.snort.org; + homepage = https://www.snort.org; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index fa1c64ba0ad7..fa3c66e67b61 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ wkennington pSub ]; - platforms = platforms.gnu; # arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index c2e6528e637e..95e01e586ec2 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = http://meetfranz.com; + homepage = https://meetfranz.com; license = licenses.free; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index bbad5a681807..f7a56d47dbfa 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,19 +1,23 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, - libtoxcore, - libpthreadstubs, libXdmcp, libXScrnSaver, - qtbase, qtsvg, qttools, qttranslations, - ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, pcre, qrencode, sqlcipher }: - -mkDerivation rec { +{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, libtoxcore +, libpthreadstubs, libXdmcp, libXScrnSaver +, qtbase, qtsvg, qttools, qttranslations +, ffmpeg, filter-audio, libexif, libsodium, libopus +, libvpx, openal, pcre, qrencode, sqlcipher +, AVFoundation ? null }: + +let + version = "1.15.0"; + rev = "v${version}"; + +in mkDerivation rec { name = "qtox-${version}"; - version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - rev = "v${version}"; - sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; + sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9"; + inherit rev; }; buildInputs = [ @@ -22,17 +26,18 @@ mkDerivation rec { qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium libvpx openal pcre qrencode sqlcipher - ]; + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; nativeBuildInputs = [ cmake pkgconfig qttools ]; enableParallelBuilding = true; cmakeFlags = [ - "-DGIT_DESCRIBE=${version}" + "-DGIT_DESCRIBE=${rev}" "-DENABLE_STATUSNOTIFIER=False" "-DENABLE_GTK_SYSTRAY=False" "-DENABLE_APPINDICATOR=False" + "-DTIMESTAMP=1" ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 768ab24c2f39..6c716cc3e1c0 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,24 +2,21 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.5"; - - # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source + version = "0.0.9"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd"; + sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - - # take the source from libqmatrixclient + # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet + # https://github.com/QMatrixClient/Quaternion/issues/239 postPatch = '' rm -rf lib ln -s ${libqmatrixclient.src} lib diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 5d004db60e3a..add337d3f085 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -5,22 +5,24 @@ with stdenv.lib; let configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); -in -stdenv.mkDerivation rec { - name = "ratox-0.4"; +in stdenv.mkDerivation rec { + name = "ratox-0.4.20180303"; src = fetchgit { url = "git://git.2f30.org/ratox.git"; - rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c"; - sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5"; + rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb"; + sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74"; }; - patches = [ ./ldlibs.patch ]; - buildInputs = [ libtoxcore ]; - preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; + preConfigure = '' + substituteInPlace config.mk \ + --replace '-lsodium -lopus -lvpx ' "" + + ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ''; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch deleted file mode 100644 index 1406e7143107..000000000000 --- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch +++ /dev/null @@ -1,5 +0,0 @@ ---- a/config.mk -+++ b/config.mk -@@ -13 +13 @@ LDFLAGS = -L/usr/local/lib --LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread -+LDLIBS = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 0d3342e66687..ce558130a6ce 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi"; + sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 2d880bef753e..4fa4967c898e 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; description = "Jabber/XMPP connection manager for the Telepathy framework"; license = licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index a1669183bb3b..89be42781a4c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = stdenv.lib.platforms.gnu; # Random choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 7894554eee4f..4607961cdf08 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "IRC connection manager for the Telepathy framework"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 111970ab7112..f1b3c55d14c3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.gnu; # Arbitrary choice + platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index e060eaabf281..17cd20c09cbd 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; - platforms = platforms.gnu; # Random choice + platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e2e25be49f23..8a45e988c07d 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "toxic-${version}"; - version = "0.7.2"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc"; + sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5"; }; makeFlags = [ "PREFIX=$(out)"]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtoxcore libsodium ncurses curl gdk_pixbuf libnotify - ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut libqrencode ]; nativeBuildInputs = [ pkgconfig libconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 9c208dd52a83..e139904fee53 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l -, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }: +{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig +, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l +, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }: stdenv.mkDerivation rec { name = "utox-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828"; + sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,16 +22,20 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake git pkgconfig check + check cmake pkgconfig ]; cmakeFlags = [ - "-DENABLE_UPDATER=OFF" - ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF"; + "-DENABLE_AUTOUPDATE=OFF" + ] ++ lib.optional (doCheck) "-DENABLE_TESTS=ON"; - doCheck = true; + doCheck = stdenv.isLinux; - checkTarget = "test"; + checkPhase = '' + runHook preCheck + ctest -VV + runHook postCheck + ''; meta = with stdenv.lib; { description = "Lightweight Tox client"; diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix index f1338bc0df35..85faebf95a3d 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix @@ -1,12 +1,12 @@ { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }: stdenv.mkDerivation { - name = "weechat-matrix-bridge-2017-03-28"; + name = "weechat-matrix-bridge-2018-01-10"; src = fetchFromGitHub { owner = "torhve"; repo = "weechat-matrix-protocol-script"; - rev = "0052e7275ae149dc5241226391c9b1889ecc3c6b"; - sha256 = "14x58jd44g08sfnp1gx74gq2na527v5jjpsvv1xx4b8mixwy20hi"; + rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7"; + sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9e946152c192..f0123024fe2f 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -61,7 +61,7 @@ in }; desktopItem = makeDesktopItem { - name = "Wire"; + name = "wire-desktop"; exec = "wire-desktop %U"; icon = "wire-desktop"; comment = "Secure messenger for everyone"; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b03673a00b66..b5bab3585c5f 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://irssi.org; + homepage = https://irssi.org; description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/applications/networking/irc/quassel/source.nix b/pkgs/applications/networking/irc/quassel/source.nix index f3941ee976e4..20daba788997 100644 --- a/pkgs/applications/networking/irc/quassel/source.nix +++ b/pkgs/applications/networking/irc/quassel/source.nix @@ -1,9 +1,9 @@ { fetchurl }: rec { - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { url = "https://github.com/quassel/quassel/archive/${version}.tar.gz"; - sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2"; + sha256 = "04f42x87a4wkj3va3wnmj2jl7ikqqa7d7nmypqpqwalzpzk7kxwv"; }; } diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b2ea28f0cf85..dec933489af9 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -29,12 +29,12 @@ let weechat = assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.0"; + version = "2.1"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn"; + sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d89219cce5f3..13add2690db3 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26.1"; + version = "0.26.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; + sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index d18342177243..e15c3588c298 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ viric vrthra ]; - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix new file mode 100644 index 000000000000..9763c0ee97fa --- /dev/null +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -0,0 +1,92 @@ +{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt +, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig +, libxml2, ncurses, gettext, libunistring, libidn +, makeWrapper, autoconf, automake, texinfo, which +, withVerbose ? false }: + +let + rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; +in +stdenv.mkDerivation rec { + name = "gnunet-git-${rev}"; + + src = fetchgit { + url = https://gnunet.org/git/gnunet.git; + inherit rev; + sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; + }; + + buildInputs = [ + libextractor libmicrohttpd libgcrypt gmp curl libtool + zlib adns sqlite libxml2 ncurses libidn + pkgconfig gettext libunistring makeWrapper + autoconf automake texinfo which + ]; + + configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; + + preConfigure = '' + # Brute force: since nix-worker chroots don't provide + # /etc/{resolv.conf,hosts}, replace all references to `localhost' + # by their IPv4 equivalent. + for i in $(find . \( -name \*.c -or -name \*.conf \) \ + -exec grep -l '\<localhost\>' {} \;) + do + echo "$i: substituting \`127.0.0.1' to \`localhost'..." + sed -i "$i" -e's/\<localhost\>/127.0.0.1/g' + done + + # Make sure the tests don't rely on `/tmp', for the sake of chroot + # builds. + for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ + -exec grep -l /tmp {} \;) + do + echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." + substituteInPlace "$i" --replace "/tmp" "$TMPDIR" + done + + # Ensure NSS installation works fine + configureFlags="$configureFlags --with-nssdir=$out/lib" + + sh contrib/pogen.sh + sh bootstrap + ''; + + doCheck = false; + + /* FIXME: Tests must be run this way, but there are still a couple of + failures. + + postInstall = + '' export GNUNET_PREFIX="$out" + export PATH="$out/bin:$PATH" + make -k check + ''; + */ + + meta = { + description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + + longDescription = '' + GNUnet is a framework for secure peer-to-peer networking that + does not use any centralized or otherwise trusted services. A + first service implemented on top of the networking layer + allows anonymous censorship-resistant file-sharing. Anonymity + is provided by making messages originating from a peer + indistinguishable from messages that the peer is routing. All + peers act as routers and use link-encrypted connections with + stable bandwidth utilization to communicate with each other. + GNUnet uses a simple, excess-based economic model to allocate + resources. Peers in GNUnet monitor each others behavior with + respect to resource usage; peers that contribute to the + network are rewarded with better service. + ''; + + homepage = https://gnunet.org/; + + license = stdenv.lib.licenses.gpl2Plus; + + maintainers = with stdenv.lib.maintainers; [ viric ]; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix index 8c8d95169c87..688bb11acd03 100644 --- a/pkgs/applications/networking/p2p/gnunet/svn.nix +++ b/pkgs/applications/networking/p2p/gnunet/svn.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index f6828fe6f317..aa42af5ccbdd 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -2,13 +2,12 @@ , enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { - pname = "tribler"; - name = "${pname}-${version}"; - version = "7.0.1"; + name = "tribler-${version}"; + version = "7.0.2"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4"; + sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42"; }; buildInputs = [ @@ -41,6 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.service-identity pythonPackages.psutil pythonPackages.meliae + pythonPackages.sip ]; postPatch = '' diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 260500e9d337..5365228ae657 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -1,28 +1,13 @@ -{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }: +{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }: -let - ld32 = - if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" - else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" - else throw "Unsupported system ${stdenv.system}"; - ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; - - mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); - - deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]); - tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); - tvldpath64 = lib.makeLibraryPath (deps pkgs); -in stdenv.mkDerivation rec { name = "teamviewer-${version}"; - version = "12.0.90041"; + version = "13.1.3026"; src = fetchurl { - # There is a 64-bit package, but it has no differences apart from Debian dependencies. - # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. - url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb"; - sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg"; + url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb"; + sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik"; }; unpackPhase = '' @@ -30,6 +15,10 @@ stdenv.mkDerivation rec { tar xf data.tar.* ''; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ]; + propagatedBuildInputs = [ qtquickcontrols ]; + installPhase = '' mkdir -p $out/share/teamviewer $out/bin $out/share/applications cp -a opt/teamviewer/* $out/share/teamviewer @@ -46,41 +35,23 @@ stdenv.mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils - pushd $out/share/teamviewer/tv_bin - - sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config - ${if stdenv.system == "x86_64-linux" then '' - sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config - '' else '' - sed -i "/TV_LD64_PATH=.*/d" script/tvw_config - ''} - - sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop - for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do - echo "patching $i" - patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do - echo "patching $i" - patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true - done - ${if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 - '' else '' - rm TVGuiSlave.64 - ''} - popd + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \ + --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2' + substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \ + --replace '/var/run/' '/run/' + wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" + wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}" ''; - dontPatchELF = true; dontStrip = true; meta = with stdenv.lib; { homepage = http://www.teamviewer.com; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jagajaga dasuxullebt ]; }; } diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index aa2a971b15f6..405ff2fde735 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.40"; + version = "1.41"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9"; + sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index ae715aa4321c..4db546651dd9 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: +{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }: buildPythonApplication rec { - version = "0.9.2.7"; + version = "0.9.3.1"; name = "syncthing-gtk-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing-gtk"; rev = "v${version}"; - sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2"; + sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb"; }; nativeBuildInputs = [ @@ -18,8 +18,8 @@ buildPythonApplication rec { ]; buildInputs = [ - gtk3 librsvg - libnotify + gtk3 librsvg libappindicator-gtk3 + libnotify gnome3.adwaita-icon-theme # Schemas with proxy configuration gnome3.gsettings-desktop-schemas ]; @@ -32,7 +32,7 @@ buildPythonApplication rec { ./disable-syncthing-binary-configuration.patch (substituteAll { src = ./paths.patch; - killall = "${psmisc}/bin/killall"; + killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall"; syncthing = "${syncthing}/bin/syncthing"; }) ]; diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch index 6c516e98acb1..14c2b62e6e38 100644 --- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch +++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch @@ -1,5 +1,5 @@ ---- a/find-daemon.glade -+++ b/find-daemon.glade +--- a/glade/find-daemon.glade ++++ b/glade/find-daemon.glade @@ -112,6 +112,7 @@ <object class="GtkEntry" id="vsyncthing_binary"> <property name="visible">True</property> @@ -16,6 +16,24 @@ <property name="receives_default">True</property> <property name="use_underline">True</property> <property name="yalign">0.51999998092651367</property> +--- a/glade/ui-settings.glade ++++ b/glade/ui-settings.glade +@@ -943,6 +943,7 @@ + <property name="label" translatable="yes">_Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> ++ <property name="sensitive">False</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <property name="yalign">0.51999998092651367</property> +@@ -974,6 +975,7 @@ + <object class="GtkEntry" id="vsyncthing_binary"> + <property name="visible">True</property> + <property name="can_focus">True</property> ++ <property name="sensitive">False</property> + <property name="hexpand">True</property> + <signal name="changed" handler="cb_check_value" swapped="no"/> + </object> --- a/syncthing_gtk/configuration.py +++ b/syncthing_gtk/configuration.py @@ -168,6 +168,8 @@ @@ -57,21 +75,3 @@ self.add_page(GenerateKeysPage()) self.add_page(HttpSettingsPage()) self.add_page(SaveSettingsPage()) ---- a/ui-settings.glade -+++ b/ui-settings.glade -@@ -943,6 +943,7 @@ - <property name="label" translatable="yes">_Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <property name="yalign">0.51999998092651367</property> -@@ -974,6 +975,7 @@ - <object class="GtkEntry" id="vsyncthing_binary"> - <property name="visible">True</property> - <property name="can_focus">True</property> -+ <property name="sensitive">False</property> - <property name="hexpand">True</property> - <signal name="changed" handler="cb_check_value" swapped="no"/> - </object> diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix new file mode 100644 index 000000000000..a56c15bffb2a --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchzip, jre }: +stdenv.mkDerivation { + name = "atlassian-cli"; + version = "7.8.0"; + src = fetchzip { + url = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip; + sha256 = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7"; + extraPostFetch = "chmod go-w $out"; + }; + tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv" + "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ]; + installPhase = '' + mkdir -p $out/{bin,share/doc/atlassian-cli} + cp -r lib $out/share/java + cp -r README.txt license $out/share/doc/atlassian-cli + for tool in $tools + do + substitute ${./wrapper.sh} $out/bin/$tool \ + --subst-var out \ + --subst-var-by jre ${jre} \ + --subst-var-by tool $tool + chmod +x $out/bin/$tool + done + ''; + meta = with stdenv.lib; { + description = "An integrated family of CLI’s for various Atlassian applications"; + homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + maintainers = [ maintainers.twey ]; + license = [ licenses.unfreeRedistributable ]; + }; +} diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/applications/office/atlassian-cli/wrapper.sh new file mode 100755 index 000000000000..80b60dbc468c --- /dev/null +++ b/pkgs/applications/office/atlassian-cli/wrapper.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +tool=@tool@ +user=ATLASSIAN_${tool^^}_USER +host=ATLASSIAN_${tool^^}_HOST +pass=ATLASSIAN_${tool^^}_PASS + +[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli +if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ] +then + >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli' + exit 1 +fi + +@jre@/bin/java \ + -jar @out@/share/java/@tool@-cli-* \ + --server "${!host}" \ + --user "${!user}" \ + --password "${!pass}" \ + "$@" diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 8449cdf05def..01014e6687cb 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -15,24 +15,16 @@ mkDerivation rec { pname = "calligra"; - version = "3.0.1"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz"; - sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5"; + sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; enableParallelBuilding = true; - patches = [ - (fetchpatch { - name = "calligra-build-with-newer-kcalcore.patch"; - url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff"; - sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0"; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index c768f4c7fa34..4d85374ee9a6 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d17cd2a7ab75..d12b1327e8f7 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,63 +1,81 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx -, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui -, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade -, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar +{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest +, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales +, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi +, libdbiDrivers, guile, perl, perlPackages }: -/* If you experience GConf errors when running GnuCash on NixOS, see - * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications - * for a possible solution. - */ +let + + # Enable gnc-fq-* to run in command line. + perlWrapper = stdenv.mkDerivation { + name = perl.name + "-wrapper-for-gnucash"; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]); + phases = [ "installPhase" ]; + installPhase = '' + mkdir -p $out/bin + for script in ${perl}/bin/*; do + makeWrapper $script $out''${script#${perl}} \ + --prefix "PERL5LIB" ":" "$PERL5LIB" + done + ''; + }; + +in stdenv.mkDerivation rec { - name = "gnucash-2.4.15"; + name = "gnucash-${version}"; + version = "3.1-1"; src = fetchurl { url = "mirror://sourceforge/gnucash/${name}.tar.bz2"; - sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx"; + sha256 = "0qfjpmr6hnr0v7l2fi00rilnlyan4kqiyygyidxlpdxqqg76dvx1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; + buildInputs = [ - libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml - libgnomeprint goffice enchant gettext intltool perl guile slibGuile - swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl - perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar + boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales + webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi + libdbiDrivers guile perlWrapper ]; - propagatedUserEnvPkgs = [ gconf ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + propagatedUserEnvPkgs = [ dconf ]; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; postInstall = '' # Auto-updaters don't make sense in Nix. rm $out/bin/gnc-fq-update - sed -i $out/bin/update-gnucash-gconf \ - -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|' - - for prog in $(echo "$out/bin/"*) - do - # Don't wrap the gnc-fq-* scripts, since gnucash calls them as - # "perl <script>', i.e. they must be Perl scripts. - if [[ $prog =~ gnc-fq ]]; then continue; fi - wrapProgram "$prog" \ - --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH" \ - --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0" \ - --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \ - --prefix PERL5LIB ":" "$PERL5LIB" \ - --set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \ - --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}" - done - - rm $out/share/icons/hicolor/icon-theme.cache - ''; + # Unnecessary in the release build. + rm $out/bin/gnucash-valgrind - # The following settings fix failures in the test suite. It's not required otherwise. - NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib"; - preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; + wrapProgram "$out/bin/gnucash" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \ + --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" + ''; - doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084 + # TODO: The following tests FAILED: + # 61 - test-gnc-timezone (Failed) + # 70 - test-load-c (Failed) + # 71 - test-modsysver (Failed) + # 72 - test-incompatdep (Failed) + # 73 - test-agedver (Failed) + # 77 - test-gnc-module-swigged-c (Failed) + # 78 - test-gnc-module-load-deps (Failed) + # 80 - test-gnc-module-scm-module (Failed) + # 81 - test-gnc-module-scm-multi (Failed) + preCheck = '' + export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$LD_LIBRARY_PATH + export NIX_CFLAGS_LINK="-lgtest -lgtest_main" + ''; + doCheck = false; enableParallelBuilding = true; @@ -80,6 +98,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 8463703c0179..2aa19dea1c24 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -9,12 +9,12 @@ mkDerivation rec { pname = "kexi"; - version = "3.0.2"; + version = "3.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/src/${name}.tar.xz"; - sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf"; + sha256 = "1ysj44qq75wglw4d080l3gfw47695gapf29scxhb1g3py55csmbd"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix new file mode 100644 index 000000000000..c04bc84c156d --- /dev/null +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools, + makeWrapper, GetoptTabular, MNI-Perllib }: + +stdenv.mkDerivation rec { + pname = "conglomerate"; + name = "${pname}-2017-09-10"; + + src = fetchFromGitHub { + owner = "BIC-MNI"; + repo = pname; + rev = "7343238bc6215942c7ecc885a224f24433a291b0"; + sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr"; + }; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ libminc zlib bicpl ]; + propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ]; + + cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ]; + + postFixup = '' + for p in $out/bin/*; do + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}"; + done + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/BIC-MNI/conglomerate; + description = "More command-line utilities for working with MINC files"; + maintainers = with maintainers; [ bcdarwin ]; + platforms = platforms.unix; + license = licenses.free; + }; +} diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c85e1143d103..4c4278c30faa 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -1,9 +1,20 @@ { stdenv , fetchurl , unzip +, makeDesktopItem , jre }: +let + desktopItem = makeDesktopItem { + name = "jmol"; + exec = "jmol"; + desktopName = "JMol"; + genericName = "Molecular Modeler"; + mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; + categories = "Graphics;Education;Science;Chemistry;"; + }; +in stdenv.mkDerivation rec { version = "${baseVersion}.${patchVersion}"; baseVersion = "14.29"; @@ -16,19 +27,18 @@ stdenv.mkDerivation rec { sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv"; }; - buildInputs = [ - jre - ]; + patchPhase = '' + sed -i -e "4s:.*:command=${jre}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol + ''; installPhase = '' - mkdir -p "$out/share/jmol" - mkdir -p "$out/bin" + mkdir -p "$out/share/jmol" "$out/bin" ${unzip}/bin/unzip jsmol.zip -d "$out/share/" - sed -i -e 's|command=java|command=${jre}/bin/java|' jmol.sh cp *.jar jmol.sh "$out/share/jmol" - ln -s $out/share/jmol/jmol.sh "$out/bin/jmol" + cp -r ${desktopItem}/share/applications $out/share + cp jmol $out/bin ''; enableParallelBuilding = true; @@ -38,7 +48,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/jmol; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = with maintainers; [ timokau mounium ]; }; } - diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 39c027706ee3..e7dd04377be7 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeDesktopItem , python3, python3Packages -, glew, freeglut, libpng, libxml2, tk, freetype }: +, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }: with stdenv.lib; let pname = "pymol"; - ver_maj = "1.8"; - ver_min = "4"; + ver_maj = "2"; + ver_min = "1"; version = "${ver_maj}.${ver_min}.0"; description = "A Python-enhanced molecular graphics tool"; @@ -16,7 +16,7 @@ let name = "${pname}"; exec = "${pname}"; desktopName = "PyMol Molecular Graphics System"; - genericName = "Molecular Modeller"; + genericName = "Molecular Modeler"; comment = description; mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;"; categories = "Graphics;Education;Science;Chemistry;"; @@ -26,10 +26,10 @@ python3Packages.buildPythonApplication { name = "pymol-${version}"; src = fetchurl { url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2"; - sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n"; + sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s"; }; - buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ]; + buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; installPhase = '' diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 6fcc8f9c111f..d21487ef92fa 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ott-${version}"; - version = "0.27"; + version = "0.28"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb"; + sha256 = "0mzbrvqayqpns9zzg4m1scxx24dv9askhn51dawyb9pisvlyvai0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index ada586fc4e6d..8229af9649f8 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -2,25 +2,30 @@ , fontconfig, libxml2, gnome2 }: assert stdenv.isLinux; - let + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.cc.cc.lib}/lib64"; + ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec"; patchExe = x: '' patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; + + patchLib = x: '' + patchelf --set-rpath ${libPath} ${x} + ''; + in stdenv.mkDerivation rec { name = "verifast-${version}"; - version = "14.5"; + version = "18.02"; src = fetchurl { - url = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/${name}-x64.tar.gz"; - sha256 = "03y1s6s2j9vqgiad0vbxriipsypxaylxxd3q36n9rvrc3lf9xra9"; + url = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz"; + sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e"; }; dontStrip = true; @@ -29,10 +34,11 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -R bin $out/libexec - ${patchExe "$out/libexec/verifast-core"} - ${patchExe "$out/libexec/vfide-core"} - ln -s $out/libexec/verifast-core $out/bin/verifast - ln -s $out/libexec/vfide-core $out/bin/vfide + ${patchExe "$out/libexec/verifast"} + ${patchExe "$out/libexec/vfide"} + ${patchLib "$out/libexec/libz3.so"} + ln -s $out/libexec/verifast $out/bin/verifast + ln -s $out/libexec/vfide $out/bin/vfide ''; meta = { diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix new file mode 100644 index 000000000000..802a03bd4c7a --- /dev/null +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, python2Packages, fetchurl }: + python2Packages.buildPythonApplication rec { + name = "labelImg-${version}"; + version = "1.6.0"; + src = fetchurl { + url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz"; + sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4"; + }; + propagatedBuildInputs = with python2Packages; [ + pyqt4 + lxml + ]; + preBuild = '' + make qt4py2 + ''; + meta = with stdenv.lib; { + description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; + homepage = https://github.com/tzutalin/labelImg; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.cmcdragonkai ]; + }; + } diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix index a4247eac627b..d8ce1d2c6280 100644 --- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix +++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix @@ -9,7 +9,7 @@ let homepage = http://torch.ch; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ smironov ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; distro_src = src; diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 486a2e69d264..957a4cf64211 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { more traditional syntax commands. ''; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index a0ee505dc97f..8cd119c7b7b0 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = "non-commercial"; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix index 0d5c79fde900..0994bb1ca38d 100644 --- a/pkgs/applications/science/misc/motu-client/default.nix +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -1,11 +1,11 @@ { python27Packages, fetchurl, lib } : python27Packages.buildPythonApplication rec { - name = "motu-client-${version}"; - version = "1.4.00"; + pname = "motu-client"; + version = "1.5.00"; src = fetchurl { url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz"; - sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb"; + sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8"; }; meta = with lib; { diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 8560d900a4fa..7db2e6a12c20 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index d6aeeedc086d..6c25f720ebf9 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }: +{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ boost hepmc lhapdf pythia ]; + nativeBuildInputs = [ makeWrapper ]; patches = [ ./compat.patch @@ -27,6 +28,13 @@ stdenv.mkDerivation rec { "--with-pythia=${pythia}" ]; + postInstall = if stdenv.isDarwin then '' + install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia + '' else '' + wrapProgram $out/bin/run-pythia \ + --prefix LD_LIBRARY_PATH : "${pythia}/lib" + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index cdbe19c53b33..340428e8e777 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { name = "sherpa-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1rw0ivx78zkbkl7nwil9i4fn8rvkifc3i20zrq3asbi4kb6brj2x"; + sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; enableParallelBuilding = true; - # LLVM 4 doesn't allow ambigous type in std::abs argument - patches = stdenv.lib.optional stdenv.cc.isClang [ ./explicit_overloads.patch ]; - configureFlags = [ "--with-sqlite3=${sqlite.dev}" "--enable-hepmc2=${hepmc}" diff --git a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch b/pkgs/applications/science/physics/sherpa/explicit_overloads.patch deleted file mode 100644 index 33e5a7632178..000000000000 --- a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/ATOOLS/Phys/Flavour.C b/ATOOLS/Phys/Flavour.C -index 1986348..740eea3 100644 ---- a/ATOOLS/Phys/Flavour.C -+++ b/ATOOLS/Phys/Flavour.C -@@ -298,8 +298,8 @@ std::string Flavour::IDName() const - - bool Flavour::IsDiQuark() const - { -- if(abs(Kfcode())>=1103&&abs(Kfcode())<=5505) { -- double help=abs(Kfcode())/100.0-int(abs(Kfcode())/100.0); -+ if(abs((long)Kfcode())>=1103&&abs((long)Kfcode())<=5505) { -+ double help=abs((long)Kfcode())/100.0-int(abs((long)Kfcode())/100.0); - if(help<0.031) return true; - } - return false; -@@ -307,27 +307,27 @@ bool Flavour::IsDiQuark() const - - bool Flavour::IsBaryon() const - { -- if (abs(Kfcode())%10000<1000) return false; -+ if (abs((long)Kfcode())%10000<1000) return false; - return !IsDiQuark(); - } - - bool Flavour::IsB_Hadron() const - { -- if (abs(Kfcode())<100) return 0; -+ if (abs((long)Kfcode())<100) return 0; - if (Kfcode()-100*int(Kfcode()/100)<10) return 0; -- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; -- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; -- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; -+ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==5) return 1; -+ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==5) return 1; -+ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1; - return 0; - } - - bool Flavour::IsC_Hadron() const - { -- if (abs(Kfcode())<100) return 0; -+ if (abs((long)Kfcode())<100) return 0; - if (Kfcode()-100*int(Kfcode()/100)<10) return 0; -- if (abs((Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; -- if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; -- if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; -+ if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==4) return 1; -+ if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==4) return 1; -+ if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1; - return 0; - } - -diff --git a/AddOns/Pythia/Pythia_Jet_Criterion.C b/AddOns/Pythia/Pythia_Jet_Criterion.C -index bbe9597..c1201e1 100644 ---- a/AddOns/Pythia/Pythia_Jet_Criterion.C -+++ b/AddOns/Pythia/Pythia_Jet_Criterion.C -@@ -117,8 +117,8 @@ namespace PYTHIA { - double Qsq = sign * Q.Abs2(); - // Mass term of radiator - DEBUG_VAR(ampl->MS()); -- double m2Rad = ( abs(RadAfterBranch.Flav().Kfcode()) >= 4 -- && abs(RadAfterBranch.Flav().Kfcode()) < 7) -+ double m2Rad = ( abs((long)RadAfterBranch.Flav().Kfcode()) >= 4 -+ && abs((long)RadAfterBranch.Flav().Kfcode()) < 7) - ? ampl->MS()->Mass2(RadAfterBranch.Flav()) - : 0.; - // Construct 2->3 variables for FSR -diff --git a/BEAM/Main/EPA.C b/BEAM/Main/EPA.C -index 861a1b2..340ac33 100644 ---- a/BEAM/Main/EPA.C -+++ b/BEAM/Main/EPA.C -@@ -54,7 +54,7 @@ double EPA::CosInt::GetCosInt(double X) - - double EPA::phi(double x, double qq) - { -- if (abs(m_beam.Kfcode()) == kf_p_plus) { -+ if (abs((long)m_beam.Kfcode()) == kf_p_plus) { - const double a = 7.16; - const double b = -3.96; - const double c = .028; -@@ -179,7 +179,7 @@ bool EPA::CalculateWeight(double x,double q2) - m_weight=0.0; - return 1; - } -- if (abs(m_beam.Kfcode()) == kf_e) { -+ if (abs((long)m_beam.Kfcode()) == kf_e) { - double f = alpha/M_PI*(1+sqr(1-m_x))/m_x*log(2.*m_energy/m_mass); - if (f < 0) f = 0.; - m_weight = f; -@@ -187,7 +187,7 @@ bool EPA::CalculateWeight(double x,double q2) - <<"energy = "<<m_energy<<", "<<"mass = "<<m_mass<<".\n"; - return 1; - } -- else if (abs(m_beam.Kfcode()) == kf_p_plus) { -+ else if (abs((long)m_beam.Kfcode()) == kf_p_plus) { - const double qz = 0.71; - double f, qmi, qma; - qma=m_q2Max/qz; -diff --git a/PDF/Remnant/Hadron_Remnant.C b/PDF/Remnant/Hadron_Remnant.C -index 243717c..58c2278 100644 ---- a/PDF/Remnant/Hadron_Remnant.C -+++ b/PDF/Remnant/Hadron_Remnant.C -@@ -188,13 +188,13 @@ ATOOLS::Flavour Hadron_Remnant::Opposite(ATOOLS::Flavour flav) const - if (m_constit[i]==flav && !found) found=true; - else rem[j++]=m_constit[i].Kfcode(); - } -- Flavour anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+3)); -+ Flavour anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+3)); - if (rem[0]!=rem[1]) { - if (ran->Get()<0.25) -- anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+1)); -+ anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+1)); - } - else { -- anti=Flavour((kf_code)(abs(rem[0])*1100+3)); -+ anti=Flavour((kf_code)(abs((long)rem[0])*1100+3)); - } - if (flav.IsAnti()) anti=anti.Bar(); - return anti; diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh deleted file mode 100644 index 1b709b613bd4..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix deleted file mode 100644 index 5883e51f712e..000000000000 --- a/pkgs/applications/taxes/aangifte-2006/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libX11, libXext}: - -stdenv.mkDerivation { - name = "aangifte2006-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz; - sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc"; - }; - - inherit libX11 libXext; - - meta = { - description = "Elektronische aangifte IB 2006"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix deleted file mode 100644 index 43fb26d811a3..000000000000 --- a/pkgs/applications/taxes/aangifte-2007/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2007-1"; - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz; - sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2007"; - homepage = "http://www.belastingdienst.nl/download/1341.html"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh deleted file mode 100644 index 79e5b3097696..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ /dev/null @@ -1,19 +0,0 @@ -source $stdenv/setup - -echo $NIX_CC - -buildPhase() { - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done -} - -installPhase() { - mkdir -p $out - cp -prvd * $out/ -} - -genericBuild diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix deleted file mode 100644 index b9fad2fa10bd..000000000000 --- a/pkgs/applications/taxes/aangifte-2008/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, libX11, libXext, libSM}: - -stdenv.mkDerivation { - name = "aangifte2008-1"; - - builder = ./builder.sh; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz; - sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3"; - }; - - inherit libX11 libXext libSM; - - dontStrip = true; - dontPatchELF = true; - - meta = { - description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix deleted file mode 100644 index d4230d426ece..000000000000 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2009-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz; - sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix deleted file mode 100644 index 602368d2017b..000000000000 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2010-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz; - sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix deleted file mode 100644 index 80c772705142..000000000000 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2011-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz; - sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin - ''; - - meta = { - description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix deleted file mode 100644 index 8066c86742c1..000000000000 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2012-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz; - sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix deleted file mode 100644 index 6f8e6d6429d3..000000000000 --- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz; - sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix deleted file mode 100644 index d75b60c83673..000000000000 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2013-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz; - sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix deleted file mode 100644 index 38124677f9a5..000000000000 --- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-wa"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz; - sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix deleted file mode 100644 index 33b6f8853aa2..000000000000 --- a/pkgs/applications/taxes/aangifte-2014/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }: - -stdenv.mkDerivation { - name = "aangifte2014-1"; - - src = fetchurl { - url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz; - sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j"; - }; - - dontStrip = true; - dontPatchELF = true; - - buildInputs = [ makeWrapper ]; - - buildPhase = - '' - for i in bin/*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \ - $i - done - ''; - - installPhase = - '' - mkdir -p $out - cp -prvd * $out/ - wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1 - ''; - - meta = { - description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)"; - homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 31504d542d26..73f9921d4865 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -4,13 +4,13 @@ let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx"; + sha256 = "1xzm8694zndl2pb4nanzhldn7wrsc1gjd5ldjncidw1msp9fczq1"; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile index 2b95446161b8..b300f27918c5 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitaly/Gemfile @@ -1,13 +1,19 @@ source 'https://rubygems.org' -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'rugged', '~> 0.27.0' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' gem 'gitlab-markup', '~> 1.6.2' -gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false -gem 'grpc', '~> 1.8.0' +gem 'grpc', '~> 1.10.0' +gem 'sentry-raven', '~> 2.7.2', require: false + +# Detects the open source license the repository includes +# This version needs to be in sync with GitLab CE/EE +gem 'licensee', '~> 8.7.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock index cb53bb10122a..2687952c805b 100644 --- a/pkgs/applications/version-management/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitaly/Gemfile.lock @@ -9,7 +9,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ast (2.3.0) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) concurrent-ruby (1.0.5) diff-lcs (1.3) escape_utils (1.1.1) @@ -17,14 +17,14 @@ GEM multipart-post (>= 1.2, < 3) gemojione (3.3.0) json - gitaly-proto (0.83.0) + gitaly-proto (0.95.0) google-protobuf (~> 3.1) - grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + grpc (~> 1.10) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-grit (2.8.2) charlock_holmes (~> 0.6) @@ -60,13 +60,15 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - grpc (1.8.7) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) i18n (0.8.1) json (2.1.0) jwt (2.1.0) + licensee (8.7.0) + rugged (~> 0.24) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -87,7 +89,7 @@ GEM ast (~> 2.2) posix-spawn (0.3.13) powerpack (0.1.1) - public_suffix (3.0.1) + public_suffix (3.0.2) rainbow (2.2.2) rake rake (12.1.0) @@ -118,9 +120,11 @@ GEM rubocop-rspec (1.17.0) rubocop (>= 0.50.0) ruby-progressbar (1.8.3) - rugged (0.26.0) + rugged (0.27.0) sanitize (2.1.0) nokogiri (>= 1.4.4) + sentry-raven (2.7.2) + faraday (>= 0.7.6, < 1.0) signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) @@ -137,16 +141,19 @@ PLATFORMS DEPENDENCIES activesupport (~> 5.0.2) - gitaly-proto (~> 0.83.0) - github-linguist (~> 4.7.0) + gitaly-proto (~> 0.95.0) + github-linguist (~> 5.3.3) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.0.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) google-protobuf (= 3.5.1) - grpc (~> 1.8.0) + grpc (~> 1.10.0) + licensee (~> 8.7.0) rdoc (~> 4.2) rspec + rugged (~> 0.27.0) + sentry-raven (~> 2.7.2) BUNDLED WITH 1.16.1 diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix index 7a8ba0fda744..32884d0a1cc5 100644 --- a/pkgs/applications/version-management/gitaly/default.nix +++ b/pkgs/applications/version-management/gitaly/default.nix @@ -7,14 +7,14 @@ let gemdir = ./.; }; in buildGoPackage rec { - version = "0.81.0"; + version = "0.95.0"; name = "gitaly-${version}"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y"; + sha256 = "0kadld8372vj0nm692mcn8j4ngph5gzzrzp8dmb4g26h10nq9k6a"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix index efe786216628..9e6f01e3679d 100644 --- a/pkgs/applications/version-management/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitaly/gemset.nix @@ -28,10 +28,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; concurrent-ruby = { source = { @@ -79,19 +79,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv"; + sha256 = "0xwgi3902c89kx0fa176wz289nh67qm9bmx0yykrg5xx1lwk8a2j"; type = "gem"; }; - version = "0.83.0"; + version = "0.95.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -184,10 +184,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.7"; + version = "1.10.0"; }; i18n = { source = { @@ -213,6 +213,15 @@ }; version = "2.1.0"; }; + licensee = { + dependencies = ["rugged"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + type = "gem"; + }; + version = "8.7.0"; + }; little-plugger = { source = { remotes = ["https://rubygems.org"]; @@ -340,10 +349,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.1"; + version = "3.0.2"; }; rainbow = { dependencies = ["rake"]; @@ -460,10 +469,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; sanitize = { dependencies = ["nokogiri"]; @@ -474,6 +483,15 @@ }; version = "2.1.0"; }; + sentry-raven = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; + type = "gem"; + }; + version = "2.7.2"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index ca5b8a84fbf9..09c1cd13d440 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab, go }: stdenv.mkDerivation rec { - version = "6.0.3"; + version = "7.1.2"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk"; + sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni"; }; buildInputs = [ ruby bundler go ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch index b0ee31cf39dd..29e4dccb26c7 100644 --- a/pkgs/applications/version-management/gitlab-shell/fixes.patch +++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch @@ -5,8 +5,8 @@ index 30a6b71..46b4dfa 100644 @@ -26,8 +26,8 @@ module GoBuild raise "env must be a hash" unless env.is_a?(Hash) raise "cmd must be an array" unless cmd.is_a?(Array) - -- if !system(env, *cmd) + +- unless system(env, *cmd) - abort "command failed: #{env.inspect} #{cmd.join(' ')}" - end + puts "Starting #{env.inspect} #{cmd.join(' ')}" diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch index bc1aa8583867..38181399eec8 100644 --- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch @@ -19,9 +19,9 @@ index 1452f95..2b40327 100644 end # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) +- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) + # Except we don't, because we're already in the right directory on nixos! -+ Kernel::exec(env, *args, unsetenv_others: true) ++ Kernel.exec(env, *args, unsetenv_others: true) end def api diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 6bb696406c9d..05cf33d408a5 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "4.1.0"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz"; + sha256 = "1yqmkpszcan5cawkl9cxjngcyqlqg061ihk31isar9ifbhpv9yfv"; }; buildInputs = [ git go ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz globin ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 97d40857e117..d85ee9886443 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -1,6 +1,18 @@ +# --- Special code for migrating to Rails 5.0 --- +def rails5? + %w[1 true].include?(ENV["RAILS5"]) +end + +gem_versions = {} +gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' +gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' +gem_versions['rails'] = rails5? ? '5.0.6' : '4.2.10' +gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' +# --- The end of special code for migrating to Rails 5.0 --- + source 'https://rubygems.org' -gem 'rails', '4.2.10' +gem 'rails', gem_versions['rails'] gem 'rails-deprecated_sanitizer', '~> 1.0.3' # Responders respond_to and respond_with @@ -9,36 +21,37 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', '~> 3.0.0' +gem 'default_value_for', gem_versions['default_value_for'] # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres -gem 'rugged', '~> 0.26.0' +gem 'rugged', '~> 0.27' gem 'grape-route-helpers', '~> 2.1.0' gem 'faraday', '~> 0.12' # Authentication libraries gem 'devise', '~> 4.2' -gem 'doorkeeper', '~> 4.2.0' -gem 'doorkeeper-openid_connect', '~> 1.2.0' -gem 'omniauth', '~> 1.4.2' +gem 'doorkeeper', '~> 4.3' +gem 'doorkeeper-openid_connect', '~> 1.3' +gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.2' +gem 'omniauth-google-oauth2', '~> 0.5.3' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 1.7.0' +gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.3.1' +gem 'omniauth-jwt', '~> 0.0.2' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt', '~> 1.5.6' @@ -81,7 +94,7 @@ gem 'gollum-lib', '~> 4.2', require: false gem 'gollum-rugged_adapter', '~> 0.4.4', require: false # Language detection -gem 'github-linguist', '~> 4.7.0', require: 'linguist' +gem 'github-linguist', '~> 5.3.3', require: 'linguist' # API gem 'grape', '~> 1.0' @@ -104,16 +117,16 @@ gem 'carrierwave', '~> 1.2' gem 'dropzonejs-rails', '~> 0.7.1' # for backups -gem 'fog-aws', '~> 1.4' +gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 0.5' +gem 'fog-google', '~> 1.3.3' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.13.6' +gem 'google-api-client', '~> 0.19.8' # for aws storage gem 'unf', '~> 0.1.4' @@ -122,17 +135,18 @@ gem 'unf', '~> 0.1.4' gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing -gem 'html-pipeline', '~> 1.11.0' +gem 'html-pipeline', '~> 2.7.1' gem 'deckar01-task_list', '2.0.0' gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' +gem 'commonmarker', '~> 0.17' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' -gem 'asciidoctor-plantuml', '0.0.7' +gem 'asciidoctor', '~> 1.5.6' +gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' @@ -148,10 +162,10 @@ group :unicorn do end # State machine -gem 'state_machines-activerecord', '~> 0.4.0' +gem 'state_machines-activerecord', '~> 0.5.1' # Issue tags -gem 'acts-as-taggable-on', '~> 4.0' +gem 'acts-as-taggable-on', '~> 5.0' # Background jobs gem 'sidekiq', '~> 5.0' @@ -207,7 +221,7 @@ gem 'asana', '~> 0.6.0' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 2.2.0' +gem 'kubeclient', '~> 3.0' # d3 gem 'd3_rails', '~> 3.5.0' @@ -217,10 +231,10 @@ gem 'sanitize', '~> 2.0' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -gem 'loofah', '~> 2.0.3' +gem 'loofah', '~> 2.2' # Working with license -gem 'licensee', '~> 8.7.0' +gem 'licensee', '~> 8.9' # Protect against bruteforcing gem 'rack-attack', '~> 4.4.1' @@ -234,9 +248,6 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.5' -# Faster JSON -gem 'oj', '~> 2.17.4' - # Faster blank gem 'fast_blank' @@ -256,22 +267,21 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 4.3.1' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.5.3' +gem 'sentry-raven', '~> 2.7' gem 'premailer-rails', '~> 1.9.7' # I18n gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', '~> 4.0.9' +gem 'rails-i18n', gem_versions['rails-i18n'] gem 'gettext_i18n_rails', '~> 1.8.0' -gem 'gettext_i18n_rails_js', '~> 1.2.0' +gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.2.1' @@ -279,7 +289,6 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' -gem 'peek-host', '~> 1.0.0' gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-performance_bar', '~> 1.3.0' gem 'peek-pg', '~> 1.3.0', group: :postgres @@ -299,8 +308,8 @@ group :metrics do end group :development do - gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.6.0', require: false + gem 'foreman', '~> 0.84.0' + gem 'brakeman', '~> 4.2', require: false gem 'letter_opener_web', '~> 1.3.0' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false @@ -359,13 +368,15 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false gem 'license_finder', '~> 3.1', require: false - gem 'knapsack', '~> 1.11.0' + gem 'knapsack', '~> 1.16' - gem 'activerecord_sane_schema_dumper', '0.2' + gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] gem 'stackprof', '~> 0.2.10', require: false gem 'simple_po_parser', '~> 1.1.2', require: false + + gem 'timecop', '~> 0.8.0' end group :test do @@ -373,21 +384,20 @@ group :test do gem 'email_spec', '~> 1.6.0' gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 2.3.2' - gem 'test_after_commit', '~> 1.1' + gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. gem 'sham_rack', '~> 1.3.6' - gem 'timecop', '~> 0.8.0' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' end -gem 'octokit', '~> 4.6.2' +gem 'octokit', '~> 4.8' gem 'mail_room', '~> 0.9.1' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 0.16.2' +gem 'ruby-prof', '~> 0.17.0' # OAuth gem 'oauth2', '~> 1.4' @@ -400,7 +410,8 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 4.1.0' +gem 'net-ssh', '~> 4.2.0' +gem 'sshkey', '~> 1.9.0' # Required for ED25519 SSH host key support group :ed25519 do @@ -410,16 +421,18 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly' +gem 'grpc', '~> 1.10.0' + # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' -gem 'toml-rb', '~> 0.3.15', require: false +gem 'toml-rb', '~> 1.0.0', require: false # Feature toggles -gem 'flipper', '~> 0.11.0' -gem 'flipper-active_record', '~> 0.11.0' -gem 'flipper-active_support_cache_store', '~> 0.11.0' +gem 'flipper', '~> 0.13.0' +gem 'flipper-active_record', '~> 0.13.0' +gem 'flipper-active_support_cache_store', '~> 0.13.0' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 4022e2896116..a1150dfccdd2 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -40,13 +40,14 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (4.0.0) - activerecord (>= 4.0) + acts-as-taggable-on (5.0.0) + activerecord (>= 4.2.8) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) + aes_key_wrap (1.0.1) akismet (2.0.0) allocations (1.0.5) arel (6.0.4) @@ -55,15 +56,15 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.7) + asciidoctor (1.5.6.2) + asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) asset_sync (2.2.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) unf - ast (2.3.0) + ast (2.4.0) atomic (1.1.99) attr_encrypted (3.0.3) encryptor (~> 3.0.0) @@ -86,7 +87,7 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.4.1) + bindata (2.4.3) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) blankslate (2.1.2.4) @@ -94,7 +95,7 @@ GEM autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap_form (2.7.0) - brakeman (3.6.1) + brakeman (4.2.1) browser (2.2.0) builder (3.2.3) bullet (5.5.1) @@ -119,7 +120,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) cause (0.1) - charlock_holmes (0.7.5) + charlock_holmes (0.7.6) childprocess (0.7.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) @@ -131,6 +132,8 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colorize (0.7.7) + commonmarker (0.17.8) + ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) @@ -140,6 +143,7 @@ GEM connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.3) creole (0.5.0) css_parser (1.5.0) addressable @@ -172,12 +176,12 @@ GEM diff-lcs (1.3) diffy (3.1.0) docile (1.1.5) - domain_name (0.5.20161021) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.6) + doorkeeper (4.3.1) railties (>= 4.2) - doorkeeper-openid_connect (1.2.0) - doorkeeper (~> 4.0) + doorkeeper-openid_connect (1.3.0) + doorkeeper (~> 4.3) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) rails (> 3.1) @@ -192,7 +196,7 @@ GEM et-orbi (1.0.3) tzinfo eventmachine (1.0.8) - excon (0.57.1) + excon (0.60.0) execjs (2.6.0) expression_parser (0.9.0) factory_bot (4.8.2) @@ -208,7 +212,7 @@ GEM faraday_middleware multi_json fast_blank (1.0.0) - fast_gettext (1.4.0) + fast_gettext (1.6.0) ffaker (2.4.0) ffi (1.9.18) flay (2.10.0) @@ -216,13 +220,13 @@ GEM path_expander (~> 1.0) ruby_parser (~> 3.0) sexp_processor (~> 4.0) - flipper (0.11.0) - flipper-active_record (0.11.0) + flipper (0.13.0) + flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) - flipper (~> 0.11.0) - flipper-active_support_cache_store (0.11.0) + flipper (~> 0.13.0) + flipper-active_support_cache_store (0.13.0) activesupport (>= 3.2, < 6) - flipper (~> 0.11.0) + flipper (~> 0.13.0) flowdock (0.7.1) httparty (~> 0.7) multi_json @@ -231,19 +235,20 @@ GEM fog-json (~> 1.0) ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (1.4.0) + fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (1.44.3) + fog-core (1.45.0) builder - excon (~> 0.49) + excon (~> 0.58) formatador (~> 0.2) - fog-google (0.5.3) + fog-google (1.3.3) fog-core fog-json fog-xml + google-api-client (~> 0.19.1) fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) @@ -263,7 +268,7 @@ GEM nokogiri (>= 1.5.11, < 2.0.0) font-awesome-rails (4.7.0.1) railties (>= 3.2, < 5.1) - foreman (0.78.0) + foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) fuubar (2.2.0) @@ -274,25 +279,25 @@ GEM gemojione (3.3.0) json get_process_mem (0.2.0) - gettext (3.2.2) + gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) fast_gettext (>= 0.9.0) - gettext_i18n_rails_js (1.2.0) + gettext_i18n_rails_js (1.3.0) gettext (>= 3.0.2) gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) gherkin-ruby (0.3.2) - gitaly-proto (0.84.0) + gitaly-proto (0.94.0) google-protobuf (~> 3.1) grpc (~> 1.0) - github-linguist (4.7.6) - charlock_holmes (~> 0.7.3) + github-linguist (5.3.3) + charlock_holmes (~> 0.7.5) escape_utils (~> 1.1.0) mime-types (>= 1.19) - rugged (>= 0.23.0b) + rugged (>= 0.25.1) github-markup (1.6.1) gitlab-flowdock-git-hook (1.0.1) flowdock (~> 0.7) @@ -333,9 +338,9 @@ GEM json multi_json request_store (>= 1.0) - google-api-client (0.13.6) + google-api-client (0.19.8) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.5) + googleauth (>= 0.5, < 0.7.0) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) @@ -343,9 +348,9 @@ GEM google-protobuf (3.5.1) googleapis-common-protos-types (1.0.1) google-protobuf (~> 3.0) - googleauth (0.5.3) + googleauth (0.6.2) faraday (~> 0.12) - jwt (~> 1.4) + jwt (>= 1.4, < 3.0) logging (~> 2.0) memoist (~> 0.12) multi_json (~> 1.11) @@ -353,7 +358,7 @@ GEM signet (~> 0.7) gpgme (2.0.13) mini_portile2 (~> 2.1) - grape (1.0.0) + grape (1.0.2) activesupport builder mustermann-grape (~> 1.0.0) @@ -369,7 +374,7 @@ GEM rake grape_logging (1.7.0) grape - grpc (1.8.3) + grpc (1.10.0) google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) googleauth (>= 0.5.1, < 0.7) @@ -386,7 +391,7 @@ GEM thor tilt hashdiff (0.3.4) - hashie (3.5.6) + hashie (3.5.7) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) health_check (2.6.0) @@ -394,26 +399,26 @@ GEM hipchat (1.5.2) httparty mimemagic - html-pipeline (1.11.0) + html-pipeline (2.7.1) activesupport (>= 2) - nokogiri (~> 1.4) + nokogiri (>= 1.4) html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (0.9.8) + http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.1) + http-form_data (1.0.3) http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - httpclient (2.8.2) - i18n (0.9.1) + httpclient (2.8.3) + i18n (0.9.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) influxdb (0.2.3) @@ -425,15 +430,11 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) - jquery-rails (4.3.1) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.2) + json-jwt (1.9.2) activesupport + aes_key_wrap bindata - multi_json (>= 1.3) securecompare url_safe_base64 json-schema (2.8.0) @@ -452,13 +453,13 @@ GEM kaminari-core (= 1.0.1) kaminari-core (1.0.1) kgio (2.10.0) - knapsack (1.11.0) + knapsack (1.16.0) rake timecop (>= 0.1.0) - kubeclient (2.2.0) - http (= 0.9.8) - recursive-open-struct (= 1.0.0) - rest-client + kubeclient (3.0.0) + http (~> 2.2.2) + recursive-open-struct (~> 1.0.4) + rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) @@ -475,7 +476,7 @@ GEM toml (= 0.1.2) with_env (> 1.0) xml-simple - licensee (8.7.0) + licensee (8.9.2) rugged (~> 0.24) little-plugger (1.1.4) locale (2.1.2) @@ -486,7 +487,8 @@ GEM actionpack (>= 4, < 5.2) activesupport (>= 4, < 5.2) railties (>= 4, < 5.2) - loofah (2.0.3) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) @@ -499,36 +501,35 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) - mini_mime (0.1.4) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.12.2) + multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - mustermann (1.0.0) + mustermann (1.0.2) mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) net-ldap (0.16.0) - net-ssh (4.1.0) + net-ssh (4.2.0) netrc (0.11.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) numerizer (0.1.1) - oauth (0.5.1) + oauth (0.5.4) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.6.2) + octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - oj (2.17.5) - omniauth (1.4.2) - hashie (>= 1.2, < 4) - rack (>= 1.0, < 3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.1) @@ -549,11 +550,13 @@ GEM omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) + omniauth-jwt (0.0.2) + jwt + omniauth (~> 1.1) omniauth-kerberos (0.3.0) omniauth-multipassword timfel-krb5-auth (~> 0.8) @@ -562,19 +565,19 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) - omniauth-saml (1.7.0) - omniauth (~> 1.3) - ruby-saml (~> 1.4) + omniauth-saml (1.10.0) + omniauth (~> 1.3, >= 1.3.2) + ruby-saml (~> 1.7) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) - omniauth-twitter (1.2.1) - json (~> 1.3) + omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) + rack omniauth_crowd (2.2.3) activesupport nokogiri (>= 1.4.4) @@ -584,8 +587,8 @@ GEM orm_adapter (0.5.0) os (0.9.6) parallel (1.12.1) - parser (2.4.0.2) - ast (~> 2.3) + parser (2.5.0.5) + ast (~> 2.4.0) parslet (1.5.0) blankslate (~> 2.0) path_expander (1.0.2) @@ -595,13 +598,11 @@ GEM railties (>= 4.0.0) peek-gc (0.0.2) peek - peek-host (1.0.0) - peek peek-mysql2 (1.1.0) atomic (>= 1.0.0) mysql2 peek - peek-performance_bar (1.3.0) + peek-performance_bar (1.3.1) peek (>= 0.1.0) peek-pg (1.3.0) concurrent-ruby @@ -646,9 +647,9 @@ GEM pry (~> 0.10) pry-rails (0.3.5) pry (>= 0.9.10) - public_suffix (3.0.0) + public_suffix (3.0.2) pyu-ruby-sasl (0.0.3.3) - rack (1.6.8) + rack (1.6.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (4.4.1) @@ -660,7 +661,7 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.1) rack rack-proxy (0.6.0) rack @@ -679,12 +680,12 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) @@ -711,7 +712,7 @@ GEM re2 (1.1.1) recaptcha (3.0.0) json - recursive-open-struct (1.0.0) + recursive-open-struct (1.0.5) redcarpet (3.4.0) redis (3.3.5) redis-actionpack (5.0.2) @@ -739,7 +740,7 @@ GEM request_store (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) - rest-client (2.0.0) + rest-client (2.0.2) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) @@ -797,11 +798,13 @@ GEM rubocop (>= 0.51) rubocop-rspec (1.22.1) rubocop (>= 0.52.1) + ruby-enum (0.7.2) + i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.16.2) + ruby-prof (0.17.0) ruby-progressbar (1.9.0) - ruby-saml (1.4.1) + ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby_parser (3.9.0) sexp_processor (~> 4.1) @@ -810,7 +813,7 @@ GEM rubyzip (1.2.1) rufus-scheduler (3.4.0) et-orbi (~> 1.0) - rugged (0.26.0) + rugged (0.27.0) safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) @@ -840,7 +843,7 @@ GEM selenium-webdriver (3.5.0) childprocess (~> 0.5) rubyzip (~> 1.0) - sentry-raven (2.5.3) + sentry-raven (2.7.2) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.9.0) @@ -858,10 +861,10 @@ GEM sidekiq (>= 4.2.1) sidekiq-limit_fetch (3.4.0) sidekiq (>= 4) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) simplecov (0.14.1) @@ -895,14 +898,15 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) + sshkey (1.9.0) stackprof (0.2.10) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) + state_machines (0.5.0) + state_machines-activemodel (0.5.1) + activemodel (>= 4.1, < 6.0) + state_machines (>= 0.5.0) + state_machines-activerecord (0.5.1) + activerecord (>= 4.1, < 6.0) + state_machines-activemodel (>= 0.5.0) stringex (2.7.1) sys-filesystem (1.1.6) ffi @@ -923,12 +927,12 @@ GEM timfel-krb5-auth (0.8.3) toml (0.1.2) parslet (~> 1.5.0) - toml-rb (0.3.15) + toml-rb (1.0.0) citrus (~> 3.0, > 3.0) truncato (0.7.10) htmlentities (~> 4.3.1) nokogiri (~> 1.8.0, >= 1.7.0) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -937,7 +941,7 @@ GEM json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.4) + unf_ext (0.0.7.5) unicode-display_width (1.3.0) unicorn (5.1.0) kgio (~> 2.6) @@ -946,13 +950,13 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - unparser (0.2.6) + unparser (0.2.7) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) concord (~> 0.1.5) diff-lcs (~> 1.3) equalizer (~> 0.0.9) - parser (>= 2.3.1.2, < 2.5) + parser (>= 2.3.1.2, < 2.6) procto (~> 0.0.2) url_safe_base64 (0.2.2) validates_hostname (1.0.6) @@ -989,13 +993,13 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord_sane_schema_dumper (= 0.2) - acts-as-taggable-on (~> 4.0) + acts-as-taggable-on (~> 5.0) addressable (~> 2.5.2) akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) - asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.7) + asciidoctor (~> 1.5.6) + asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) @@ -1008,7 +1012,7 @@ DEPENDENCIES binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) bootstrap_form (~> 2.7.0) - brakeman (~> 3.6.0) + brakeman (~> 4.2) browser (~> 2.2) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) @@ -1018,6 +1022,7 @@ DEPENDENCIES charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) chronic_duration (~> 0.10.6) + commonmarker (~> 0.17) concurrent-ruby (~> 1.0.5) connection_pool (~> 2.0) creole (~> 0.5.0) @@ -1028,8 +1033,8 @@ DEPENDENCIES devise (~> 4.2) devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) - doorkeeper (~> 4.2.0) - doorkeeper-openid_connect (~> 1.2.0) + doorkeeper (~> 4.3) + doorkeeper-openid_connect (~> 1.3) dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) @@ -1038,26 +1043,26 @@ DEPENDENCIES fast_blank ffaker (~> 2.4) flay (~> 2.10.0) - flipper (~> 0.11.0) - flipper-active_record (~> 0.11.0) - flipper-active_support_cache_store (~> 0.11.0) + flipper (~> 0.13.0) + flipper-active_record (~> 0.13.0) + flipper-active_support_cache_store (~> 0.13.0) fog-aliyun (~> 0.2.0) - fog-aws (~> 1.4) + fog-aws (~> 2.0.1) fog-core (~> 1.44) - fog-google (~> 0.5) + fog-google (~> 1.3.3) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) font-awesome-rails (~> 4.7) - foreman (~> 0.78.0) + foreman (~> 0.84.0) fuubar (~> 2.2.0) gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.3) gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) - gettext_i18n_rails_js (~> 1.2.0) - gitaly-proto (~> 0.84.0) - github-linguist (~> 4.7.0) + gettext_i18n_rails_js (~> 1.3) + gitaly-proto (~> 0.94.0) + github-linguist (~> 5.3.3) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.3) @@ -1065,47 +1070,46 @@ DEPENDENCIES gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) - google-api-client (~> 0.13.6) + google-api-client (~> 0.19.8) google-protobuf (= 3.5.1) gpgme grape (~> 1.0) grape-entity (~> 0.6.0) grape-route-helpers (~> 2.1.0) grape_logging (~> 1.7) + grpc (~> 1.10.0) haml_lint (~> 0.26.0) hamlit (~> 2.6.1) hashie-forbidden_attributes health_check (~> 2.6.0) hipchat (~> 1.5.0) - html-pipeline (~> 1.11.0) + html-pipeline (~> 2.7.1) html2text httparty (~> 0.13.3) influxdb (~> 0.2) jira-ruby (~> 1.4) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 4.3.1) json-schema (~> 2.8.0) jwt (~> 1.5.6) kaminari (~> 1.0) - knapsack (~> 1.11.0) - kubeclient (~> 2.2.0) + knapsack (~> 1.16) + kubeclient (~> 3.0) letter_opener_web (~> 1.3.0) license_finder (~> 3.1) - licensee (~> 8.7.0) + licensee (~> 8.9) lograge (~> 0.5) - loofah (~> 2.0.3) + loofah (~> 2.2) mail_room (~> 0.9.1) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap - net-ssh (~> 4.1.0) + net-ssh (~> 4.2.0) nokogiri (~> 1.8.2) oauth2 (~> 1.4) - octokit (~> 4.6.2) - oj (~> 2.17.4) - omniauth (~> 1.4.2) + octokit (~> 4.8) + omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.1) omniauth-azure-oauth2 (~> 0.0.9) @@ -1113,17 +1117,17 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.2) + omniauth-google-oauth2 (~> 0.5.3) + omniauth-jwt (~> 0.0.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) - omniauth-saml (~> 1.7.0) + omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.2.0) - omniauth-twitter (~> 1.2.0) + omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) peek (~> 1.0.1) peek-gc (~> 0.0.2) - peek-host (~> 1.0.0) peek-mysql2 (~> 1.1.0) peek-performance_bar (~> 1.3.0) peek-pg (~> 1.3.0) @@ -1166,17 +1170,17 @@ DEPENDENCIES rubocop (~> 0.52.1) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.16.2) + ruby-prof (~> 0.17.0) ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) - rugged (~> 0.26.0) + rugged (~> 0.27) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) select2-rails (~> 3.5.9) selenium-webdriver (~> 3.5) - sentry-raven (~> 2.5.3) + sentry-raven (~> 2.7) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 3.1.2) @@ -1192,14 +1196,15 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) sprockets (~> 3.7.0) + sshkey (~> 1.9.0) stackprof (~> 0.2.10) - state_machines-activerecord (~> 0.4.0) + state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) test-prof (~> 0.2.5) test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) - toml-rb (~> 0.3.15) + toml-rb (~> 1.0.0) truncato (~> 0.7.9) u2f (~> 0.2.1) uglifier (~> 2.7.2) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7cfaeff33827..8564e4af91b1 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,15 +1,13 @@ { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv -, ruby, tzdata, git, ps, dpkg, nettools +, ruby, tzdata, git, procps, nettools }: -/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` - to allow building the assets without a database */ - let rubyEnv = bundlerEnv { name = "gitlab-env-${version}"; inherit ruby; gemdir = ./.; + groups = [ "default" "unicorn" "ed25519" "metrics" ]; meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; @@ -18,11 +16,11 @@ let }; }; - version = "10.5.6"; + version = "10.7.0"; gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; - sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0"; + sha256 = "0dngh6gj8kkfcxn6ki9i96jg4x1x0vq3zzdimxz31g3j2zpd0ryz"; }; in @@ -34,16 +32,15 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0"; + sha256 = "010xhzrp6svp2a4xzmzwl4x3hk9wc1frqr66lp8x58nfmvr8hdrg"; }; buildInputs = [ - rubyEnv ruby bundler tzdata git ps dpkg nettools + rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools ]; patches = [ ./remove-hardcoded-locations.patch - ./fix-36783.patch ]; postPatch = '' @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { rm config/initializers/gitlab_shell_secret_token.rb substituteInPlace app/controllers/admin/background_jobs_controller.rb \ - --replace "ps -U" "${ps}/bin/ps -U" + --replace "ps -U" "${procps}/bin/ps -U" sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake @@ -105,6 +102,6 @@ stdenv.mkDerivation rec { passthru = { inherit rubyEnv; - inherit ruby; + ruby = rubyEnv.wrappedRuby; }; } diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 4a021f5f2d97..d14a963a8c07 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -91,10 +91,10 @@ dependencies = ["activerecord"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s"; + sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.0"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -114,6 +114,14 @@ }; version = "2.5.2"; }; + aes_key_wrap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; + type = "gem"; + }; + version = "1.0.1"; + }; akismet = { source = { remotes = ["https://rubygems.org"]; @@ -150,19 +158,19 @@ asciidoctor = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0"; + sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.6.2"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88"; + sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; asset_sync = { dependencies = ["activemodel" "fog-core" "mime-types" "unf"]; @@ -176,10 +184,10 @@ ast = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m"; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; atomic = { source = { @@ -292,10 +300,10 @@ bindata = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z"; + sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; type = "gem"; }; - version = "2.4.1"; + version = "2.4.3"; }; binding_of_caller = { dependencies = ["debug_inspector"]; @@ -334,10 +342,10 @@ brakeman = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxv3cgmjh6rimz2jcslj3qnh1vqqz1grrjnp6m3nywbznlv441w"; + sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; type = "gem"; }; - version = "3.6.1"; + version = "4.2.1"; }; browser = { source = { @@ -419,10 +427,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; childprocess = { dependencies = ["ffi"]; @@ -491,6 +499,15 @@ }; version = "0.7.7"; }; + commonmarker = { + dependencies = ["ruby-enum"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02iz27421qk6lnn0xwlz95w5l65dc4rnfqlwyal0h6mnawwy3b5i"; + type = "gem"; + }; + version = "0.17.8"; + }; concord = { dependencies = ["adamantium" "equalizer"]; source = { @@ -534,6 +551,14 @@ }; version = "0.4.3"; }; + crass = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1czijxlagzpzwchr2ldrgfi7kywg08idjpq37ndcmwh4fmz72c4l"; + type = "gem"; + }; + version = "1.0.3"; + }; creole = { source = { remotes = ["https://rubygems.org"]; @@ -681,28 +706,28 @@ dependencies = ["unf"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl"; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; type = "gem"; }; - version = "0.5.20161021"; + version = "0.5.20170404"; }; doorkeeper = { dependencies = ["railties"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah"; + sha256 = "1yjbmkhpj25h6n5hi382gxna1303crr4v57w1ic23n0w8ll6jh0z"; type = "gem"; }; - version = "4.2.6"; + version = "4.3.1"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827"; + sha256 = "1sknjc7gdyswvyh6bry3l4l57hjcab0bmkyz88i9k7qbb4p1fwck"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; dropzonejs-rails = { dependencies = ["rails"]; @@ -782,10 +807,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kc2l7kqrj8lhmrz3v21xhsl2laps4y2xmf952m2qrgzffy1pacg"; + sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc"; type = "gem"; }; - version = "0.57.1"; + version = "0.60.0"; }; execjs = { source = { @@ -859,10 +884,10 @@ fast_gettext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1l8snpgxrri8jc0c35s6h3n92j8bfahh1knj94mw6i4zqhnpv40z"; + sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.0"; }; ffaker = { source = { @@ -892,28 +917,28 @@ flipper = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87"; + sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91"; + sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb"; + sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; type = "gem"; }; - version = "0.11.0"; + version = "0.13.0"; }; flowdock = { dependencies = ["httparty" "multi_json"]; @@ -937,28 +962,28 @@ dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z5zkz7998l0bcxdp0cz4wg4ds4mhdzxd90xxqd50f52cqy85fjg"; + sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.1"; }; fog-core = { dependencies = ["builder" "excon" "formatador"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w8ph79x0jp810qdzr5a73hpf39v27y0an23j7ifyk5zsq0j3maw"; + sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3"; type = "gem"; }; - version = "1.44.3"; + version = "1.45.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "179kk6mr84wsybm2afjckm8y95z3b5hg84xlgv8l2cv46wdql2ii"; + sha256 = "09q0khxyaqckgz2d44sp4zkw61gbmhjdww0wsqjy5mwj041bwn3i"; type = "gem"; }; - version = "0.5.3"; + version = "1.3.3"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1018,10 +1043,10 @@ dependencies = ["thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq"; + sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; type = "gem"; }; - version = "0.78.0"; + version = "0.84.0"; }; formatador = { source = { @@ -1070,10 +1095,10 @@ dependencies = ["locale" "text"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2i1zfqvaxqi01g9vvkfkf5r85c5nfj2zwpd2ib9vvkjavhn9cx"; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.9"; }; gettext_i18n_rails = { dependencies = ["fast_gettext"]; @@ -1088,10 +1113,10 @@ dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "04lkmy6mgxdnpl4icddg00nj0ay0ylacfxrm723npzaqviml7c2x"; + sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gherkin-ruby = { source = { @@ -1105,19 +1130,19 @@ dependencies = ["google-protobuf" "grpc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8"; + sha256 = "1rnfswh0jpsiyzvsac7kwk9rpbpf4fcz9p2i8pamqamm3skgd4i6"; type = "gem"; }; - version = "0.84.0"; + version = "0.94.0"; }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd"; + sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk"; type = "gem"; }; - version = "4.7.6"; + version = "5.3.3"; }; github-markup = { source = { @@ -1220,10 +1245,10 @@ dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y"; + sha256 = "1gk6c21na1sizgsi71c6l6gpyjgib863jg991ycmrdnpr12mvs0q"; type = "gem"; }; - version = "0.13.6"; + version = "0.19.8"; }; google-protobuf = { source = { @@ -1246,10 +1271,10 @@ dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli"; + sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f"; type = "gem"; }; - version = "0.5.3"; + version = "0.6.2"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1264,10 +1289,10 @@ dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv"; + sha256 = "1nv7ijyr20can779cfgna76dwrckmscpc7nxj699lrwarr9as17v"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1300,10 +1325,10 @@ dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j"; + sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82"; type = "gem"; }; - version = "1.8.3"; + version = "1.10.0"; }; haml = { dependencies = ["tilt"]; @@ -1343,10 +1368,10 @@ hashie = { source = { remotes = ["https://rubygems.org"]; - sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7"; + sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; type = "gem"; }; - version = "3.5.6"; + version = "3.5.7"; }; hashie-forbidden_attributes = { dependencies = ["hashie"]; @@ -1379,10 +1404,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l"; + sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd"; type = "gem"; }; - version = "1.11.0"; + version = "2.7.1"; }; html2text = { dependencies = ["nokogiri"]; @@ -1405,10 +1430,10 @@ dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi"; + sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r"; type = "gem"; }; - version = "0.9.8"; + version = "2.2.2"; }; http-cookie = { dependencies = ["domain_name"]; @@ -1422,10 +1447,10 @@ http-form_data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9"; + sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.3"; }; "http_parser.rb" = { source = { @@ -1447,19 +1472,19 @@ httpclient = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg15svk9lv5r7w1hxd87di6apsr9y009af3mm01xcaccvqj4j2d"; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.3"; }; i18n = { dependencies = ["concurrent-ruby"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s"; + sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3"; type = "gem"; }; - version = "0.9.1"; + version = "0.9.5"; }; ice_nine = { source = { @@ -1503,15 +1528,6 @@ }; version = "1.3.2"; }; - jquery-rails = { - dependencies = ["rails-dom-testing" "railties" "thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki"; - type = "gem"; - }; - version = "4.3.1"; - }; json = { source = { remotes = ["https://rubygems.org"]; @@ -1521,13 +1537,13 @@ version = "1.8.6"; }; json-jwt = { - dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"]; + dependencies = ["activesupport" "aes_key_wrap" "bindata" "securecompare" "url_safe_base64"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2"; + sha256 = "08sisbiz851ny0bgikfqdqjn1hqpgrzsfzddpm7s5a8ln51s9x78"; type = "gem"; }; - version = "1.7.2"; + version = "1.9.2"; }; json-schema = { dependencies = ["addressable"]; @@ -1593,19 +1609,19 @@ dependencies = ["rake" "timecop"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0bp5al0b8wyzw8ff99jwr6qsh5n52xqryvzvy2nbrma9qr7dam"; + sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di"; type = "gem"; }; - version = "1.11.0"; + version = "1.16.0"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi"; + sha256 = "14kmip7zprb7q6rp4lj011ikv33x193sy1642l2gmf8yv320h0sw"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; launchy = { dependencies = ["addressable"]; @@ -1647,10 +1663,10 @@ dependencies = ["rugged"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2"; + sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; type = "gem"; }; - version = "8.7.0"; + version = "8.9.2"; }; little-plugger = { source = { @@ -1687,13 +1703,13 @@ version = "0.5.1"; }; loofah = { - dependencies = ["nokogiri"]; + dependencies = ["crass" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy"; type = "gem"; }; - version = "2.0.3"; + version = "2.2.2"; }; mail = { dependencies = ["mini_mime"]; @@ -1765,10 +1781,10 @@ mini_mime = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg"; + sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8"; type = "gem"; }; - version = "0.1.4"; + version = "1.0.0"; }; mini_portile2 = { source = { @@ -1797,10 +1813,10 @@ multi_json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x"; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; multi_xml = { source = { @@ -1821,10 +1837,10 @@ mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0npddl1kf72i3m72vs72a24z2rpgspis3hbzyni9fsds96zf0zyl"; + sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.2"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -1854,10 +1870,10 @@ net-ssh = { source = { remotes = ["https://rubygems.org"]; - sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; + sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.0"; }; netrc = { source = { @@ -1887,10 +1903,10 @@ oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.4"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1905,27 +1921,19 @@ dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bppfc0q8mflbcdsb66dly3skx42vad30q0fkzwx4za908qwvjpd"; - type = "gem"; - }; - version = "4.6.2"; - }; - oj = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17c50q2ygi8jlw8dq3ghzha774ln1swbvmvai2ar7qb3bwcfgc8b"; + sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg"; type = "gem"; }; - version = "2.17.5"; + version = "4.8.0"; }; omniauth = { dependencies = ["hashie" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kvr0g12fawf491jmdaxzzr6qyd1r8ixzkcdr0zscs42fqsxv79i"; + sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg"; type = "gem"; }; - version = "1.4.2"; + version = "1.8.1"; }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; @@ -1991,13 +1999,22 @@ version = "1.0.2"; }; omniauth-google-oauth2 = { - dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"]; + dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym"; + type = "gem"; + }; + version = "0.5.3"; + }; + omniauth-jwt = { + dependencies = ["jwt" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz"; + sha256 = "0qxr95z5p7fs13mg04zp76ldplgk6n8fkwbn17mlzlry1ihcrgxr"; type = "gem"; }; - version = "0.5.2"; + version = "0.0.2"; }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; @@ -2030,10 +2047,10 @@ dependencies = ["oauth2" "omniauth"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5"; + sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -2048,10 +2065,10 @@ dependencies = ["omniauth" "ruby-saml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x"; + sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p"; type = "gem"; }; - version = "1.7.0"; + version = "1.10.0"; }; omniauth-shibboleth = { dependencies = ["omniauth"]; @@ -2063,13 +2080,13 @@ version = "1.2.1"; }; omniauth-twitter = { - dependencies = ["json" "omniauth-oauth"]; + dependencies = ["omniauth-oauth" "rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833"; + sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.0"; }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; @@ -2117,10 +2134,10 @@ dependencies = ["ast"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3"; + sha256 = "1sj8dlqs5l2pa5y2412r4d5fi7qvf26n8vpciz7k9fy0ch327gdc"; type = "gem"; }; - version = "2.4.0.2"; + version = "2.5.0.5"; }; parslet = { dependencies = ["blankslate"]; @@ -2157,15 +2174,6 @@ }; version = "0.0.2"; }; - peek-host = { - dependencies = ["peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11ra0hzdkdywp3cmaizcisliy26jwz7k0r9nkgm87y7amqk1wh8b"; - type = "gem"; - }; - version = "1.0.0"; - }; peek-mysql2 = { dependencies = ["atomic" "mysql2" "peek"]; source = { @@ -2179,10 +2187,10 @@ dependencies = ["peek"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "08i2gvn59hsbysbmnakxdcpm0jvhh6rl00pr5i3zqf2f5dd0sjz6"; + sha256 = "1a0ly4p8xnrb3pnf273qq2d5bm2w19p829n4n2730rijd42pa2n4"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; peek-pg = { dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; @@ -2326,10 +2334,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f"; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.2"; }; pyu-ruby-sasl = { source = { @@ -2342,10 +2350,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.9"; }; rack-accept = { dependencies = ["rack"]; @@ -2386,10 +2394,10 @@ dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7"; type = "gem"; }; - version = "1.5.3"; + version = "2.0.1"; }; rack-proxy = { dependencies = ["rack"]; @@ -2431,19 +2439,19 @@ dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r"; + sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6"; type = "gem"; }; - version = "1.0.8"; + version = "1.0.9"; }; rails-html-sanitizer = { dependencies = ["loofah"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7"; + sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -2561,10 +2569,10 @@ recursive-open-struct = { source = { remotes = ["https://rubygems.org"]; - sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw"; + sha256 = "0p8x9w9zzv56ka6czdmzl5sbsqjhnb9lkchvw55rf5lp8h0z3r6z"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.5"; }; redcarpet = { source = { @@ -2674,10 +2682,10 @@ dependencies = ["http-cookie" "mime-types" "netrc"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7"; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; type = "gem"; }; - version = "2.0.0"; + version = "2.0.2"; }; retriable = { source = { @@ -2844,6 +2852,15 @@ }; version = "1.22.1"; }; + ruby-enum = { + dependencies = ["i18n"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + type = "gem"; + }; + version = "0.7.2"; + }; ruby-fogbugz = { dependencies = ["crack"]; source = { @@ -2856,10 +2873,10 @@ ruby-prof = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag"; + sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; type = "gem"; }; - version = "0.16.2"; + version = "0.17.0"; }; ruby-progressbar = { source = { @@ -2873,10 +2890,10 @@ dependencies = ["nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5"; + sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; type = "gem"; }; - version = "1.4.1"; + version = "1.7.2"; }; ruby_parser = { dependencies = ["sexp_processor"]; @@ -2923,10 +2940,10 @@ rugged = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy"; + sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; type = "gem"; }; - version = "0.26.0"; + version = "0.27.0"; }; safe_yaml = { source = { @@ -3029,10 +3046,10 @@ dependencies = ["faraday"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19qqb7whayd170y45asc3cr3mbxfd46fv6s4jbs5xx1wphy4q80i"; + sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4"; type = "gem"; }; - version = "2.5.3"; + version = "2.7.2"; }; settingslogic = { source = { @@ -3099,10 +3116,10 @@ dependencies = ["addressable" "faraday" "jwt" "multi_json"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv"; type = "gem"; }; - version = "0.7.3"; + version = "0.8.1"; }; simple_po_parser = { source = { @@ -3225,6 +3242,14 @@ }; version = "1.3.13"; }; + sshkey = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h"; + type = "gem"; + }; + version = "1.9.0"; + }; stackprof = { source = { remotes = ["https://rubygems.org"]; @@ -3236,28 +3261,28 @@ state_machines = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787"; + sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; state_machines-activemodel = { dependencies = ["activemodel" "state_machines"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p6560jsb4flapd1vbc50bqjk6dzykkwbmyivchyjh5ncynsdb8v"; + sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x5wx1s2i3qc4p2knkf2n9h8b49pla9rjidkwxqzi781qm40wdxx"; + sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.1"; }; stringex = { source = { @@ -3379,10 +3404,10 @@ dependencies = ["citrus"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03sr3k193i1r5bh9g4zc7iq9jklapmwj0rndcvhr9q7v5xm7x4rf"; + sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; type = "gem"; }; - version = "0.3.15"; + version = "1.0.0"; }; truncato = { dependencies = ["htmlentities" "nokogiri"]; @@ -3397,10 +3422,10 @@ dependencies = ["thread_safe"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; type = "gem"; }; - version = "1.2.4"; + version = "1.2.5"; }; u2f = { source = { @@ -3439,10 +3464,10 @@ unf_ext = { source = { remotes = ["https://rubygems.org"]; - sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb"; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; }; - version = "0.0.7.4"; + version = "0.0.7.5"; }; unicode-display_width = { source = { @@ -3482,10 +3507,10 @@ dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jhpgvghn764myi5iwlys98f71yspwgrzimzz11108jnhl5rcx7l"; + sha256 = "0k2asbk9k5kzq8jidy3frqcmn58i9cvaizn8f6g5xlx1pn70bx1w"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.7"; }; url_safe_base64 = { source = { diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 6ce2ae08eeb4..d13995f6e9bd 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ # # Only tested on Linux -{ stdenv, lib, fetchFromGitHub, +{ stdenv, lib, fetchurl, python2, pkgconfig, yasm, harfbuzz, zlib, autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, @@ -25,16 +25,24 @@ }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; name = "handbrake-${version}"; - src = fetchFromGitHub { - owner = "HandBrake"; - repo = "HandBrake"; - rev = "${version}"; - sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57"; + src = fetchurl { + url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2''; + sha256 = "1nj0ihflisxcfkmsk7fm3b5cn7cpnpg66dk2lkp2ip6qidppqbm0"; }; + patched_libav_12 = libav_12.overrideAttrs (super: { + # 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream. + patches = (super.patches or []) ++ [( + fetchurl { + url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch''; + sha256 = "14grzyvb1qbb90k31ibabnwmwnrc48ml6h2z0rjamdv83q45jq4g"; + }) + ]; + }); + nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; @@ -48,7 +56,7 @@ stdenv.mkDerivation rec { glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; @@ -58,11 +66,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs scripts - # `configure` errors out when trying to read the current year which is too low - substituteInPlace make/configure.py \ - --replace developer release \ - --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""' - substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index a4b08e1ce47c..acc9c88d2ffe 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl -, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav +, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.8"; + ver = "1.12.2"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29"; + sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7"; + sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [openssl qt4 libGLU_combined zlib libav]; + buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ] + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ] + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 421e0dbb8a39..aa17cf183e34 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -77,7 +77,7 @@ let # for purity reasons this behavior should be avoided. wafVersion = "1.9.15"; waf = fetchurl { - urls = [ "http://waf.io/waf-${wafVersion}" + urls = [ "https://waf.io/waf-${wafVersion}" "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5"; }; @@ -200,7 +200,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; - homepage = http://mpv.io; + homepage = https://mpv.io; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 48074a86b552..6c92b9aeed6b 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,61 +1,80 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook , python3Packages, gst, gtk3, hicolor-icon-theme , gobjectIntrospection, librsvg, gnome3, libnotify -# for gst-transcoder: -, which, meson, ninja +, meson, ninja }: let - version = "0.96"; + version = "0.99"; # gst-transcoder will eventually be merged with gstreamer (according to # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we # don't bother exposing the package to all of nixpkgs. gst-transcoder = stdenv.mkDerivation rec { - name = "gst-transcoder-1.8.0"; + version = "1.12.2"; + name = "gst-transcoder-${version}"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz"; - sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6"; + url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz"; + sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which meson ninja gobjectIntrospection ] - ++ (with gst; [ gstreamer gst-plugins-base ]); + nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ]; + buildInputs = with gst; [ gstreamer gst-plugins-base ]; }; -in stdenv.mkDerivation rec { +in python3Packages.buildPythonApplication rec { name = "pitivi-${version}"; src = fetchurl { - url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz"; - sha256 = "115d37mvi32yds8gqj2yidkk6pap7szavhjf2hw0388ynydlc2zs"; + url = "mirror://gnome/sources/pitivi/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69"; }; - nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + format = "other"; + + patches = [ + # By default, the build picks up environment variables like PYTHONPATH + # and saves them to the generated binary. This would make the build-time + # dependencies part of the closure so we remove it. + ./prevent-closure-contamination.patch + ]; + + postPatch = '' + patchShebangs ./getenvvar.py + ''; + + nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ]; buildInputs = [ - gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop + gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst; [ gstreamer gst-editing-services - gst-plugins-base gst-plugins-good + gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-plugins-bad gst-plugins-ugly gst-libav gst-validate - ]) ++ (with python3Packages; [ - python pygobject3 gst-python pyxdg numpy pycairo matplotlib - dbus-python ]); + pythonPath = with python3Packages; [ pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "pitivi"; + versionPolicy = "none"; # we are using dev version, since the stable one is too old + }; + }; + meta = with stdenv.lib; { description = "Non-Linear video editor utilizing the power of GStreamer"; - homepage = "http://pitivi.org/"; + homepage = http://pitivi.org/; longDescription = '' Pitivi is a video editor built upon the GStreamer Editing Services. It aims to be an intuitive and flexible application that can appeal to newbies and professionals alike. ''; - license = licenses.lgpl21Plus; - platforms = platforms.linux; + license = licenses.lgpl21Plus; + maintainers = with maintainers; []; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch new file mode 100644 index 000000000000..0025ecd0a4cf --- /dev/null +++ b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch @@ -0,0 +1,23 @@ +--- a/meson.build ++++ b/meson.build +@@ -26,15 +26,15 @@ + geteenvvar = find_program('getenvvar.py') + cdata = configuration_data() + cdata.set('CONFIGURED_PYTHONPATH', +- run_command(geteenvvar, 'PYTHONPATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GI_TYPELIB_PATH', +- run_command(geteenvvar, 'GI_TYPELIB_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_LD_LIBRARY_PATH', +- run_command(geteenvvar, 'LD_LIBRARY_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GST_PLUGIN_PATH', +- run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip()) ++ '') + cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH', +- run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip()) ++ '') + cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) + cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir'))) + cdata.set('PACKAGE_NAME', 'Pitivi') diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 412cc1ad2728..2454044bb48e 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 6b1389c97ab0..0a786312214a 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "17.11"; + version = "18.03.06"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1bw2cjpzycddxi9b21haiaslv0ikia85wwgkfm2xl2m15w5j8510"; + sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash"; }; enableParallelBuilding = true; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; homepage = https://shotcut.org; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu woffs ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index ef614d41d00d..49444e350de4 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.3.0"; + name = "smplayer-18.4.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46"; + sha256 = "0q2fbg41djyxsy6jinlnidpcqxvs9bi91ga3fwlgnfh6kxsw2ldd"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 533721034575..3854c577188f 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; + sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 61899d12974f..2a271a96ecd4 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -198,13 +198,13 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_03 = dockerGen rec { - version = "18.03.0-ce"; - rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit - sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g"; + version = "18.03.1-ce"; + rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit + sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx"; runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; - containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c"; - containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0"; + containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; + containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4463a70398ca..bb2243ca97b9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 @@ -21,15 +21,15 @@ with stdenv.lib; let - version = "2.11.1"; - sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr"; + version = "2.12.0"; + sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" else if stdenv.isi686 then "i386-softmmu" - else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch32 then "arm-softmmu" else if stdenv.isAarch64 then "aarch64-softmmu" else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in @@ -69,11 +69,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "ga" ]; - patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch { - name = "glibc-2.27-memfd.patch"; - url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }) ] + patches = [ ./no-etc-install.patch ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ @@ -99,6 +95,8 @@ stdenv.mkDerivation rec { preConfigure = '' unset CPP # intereferes with dependency calculation + '' + optionalString stdenv.hostPlatform.isMusl '' + NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H" ''; configureFlags = @@ -137,7 +135,7 @@ stdenv.mkDerivation rec { postInstall = if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' - else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' + else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"'' else ""; diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix deleted file mode 100644 index 2159ad4b4dc9..000000000000 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ qemu, fetchFromGitHub, lib }: let - src = fetchFromGitHub { - owner = "riscv"; - repo = "riscv-qemu"; - rev = "f733c7b5f86147216e14aff90c03ccdd76056bef"; - sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq"; - fetchSubmodules = true; - }; - version = "2.11.92"; - revCount = "60378"; - shortRev = builtins.substring 0 9 src.rev; - targets = [ "riscv32-linux-user" "riscv32-softmmu" - "riscv64-linux-user" "riscv64-softmmu" - ]; -in lib.overrideDerivation qemu (orig: { - name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; - inherit src; -# <<<<<<< HEAD -# # https://github.com/riscv/riscv-qemu/pull/109 -# patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ]; -# ======= - # The pulseaudio and statfs patches are in 2.12.0+, which this is based on - patches = [ - ./force-uid0-on-9p.patch - ./no-etc-install.patch - ]; - - configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; - postInstall = null; -}) diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch deleted file mode 100644 index 52a470a2869a..000000000000 --- a/pkgs/applications/virtualization/qemu/statfs-flags.patch +++ /dev/null @@ -1,197 +0,0 @@ -commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a -Author: Shea Levy <shea@shealevy.com> -Date: Sun Feb 18 13:50:11 2018 -0500 - - linux-user: Support f_flags in statfs when available. - - Signed-off-by: Shea Levy <shea@shealevy.com> - -diff --git a/configure b/configure -index 913e14839d..52fe2bf941 100755 ---- a/configure -+++ b/configure -@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then - have_utmpx=yes - fi - -+########################################## -+# Check for newer fields of struct statfs on Linux -+ -+if test "$linux_user" = "yes"; then -+ cat > $TMPC <<EOF -+#include <sys/vfs.h> -+ -+int main(void) { -+ struct statfs fs; -+ fs.f_flags = 0; -+} -+EOF -+ if compile_object ; then -+ have_statfs_flags=yes -+ fi -+fi - ########################################## - # checks for sanitizers - -@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then - echo "HAVE_UTMPX=y" >> $config_host_mak - fi - -+if test "$have_statfs_flags" = "yes" ; then -+ echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak -+fi -+ - if test "$ivshmem" = "yes" ; then - echo "CONFIG_IVSHMEM=y" >> $config_host_mak - fi -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 82b35a6bdf..77481eca2c 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]); - __put_user(stfs.f_namelen, &target_stfs->f_namelen); - __put_user(stfs.f_frsize, &target_stfs->f_frsize); -+#ifdef HAVE_STATFS_FLAGS -+ __put_user(stfs.f_flags, &target_stfs->f_flags); -+#endif - memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare)); - unlock_user_struct(target_stfs, arg2, 1); - } -diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h -index a35c52a60a..64aa49d3c5 100644 ---- a/linux-user/syscall_defs.h -+++ b/linux-user/syscall_defs.h -@@ -362,7 +362,14 @@ struct kernel_statfs { - int f_ffree; - kernel_fsid_t f_fsid; - int f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ int f_frsize; -+ int f_flags; -+ int f_spare[4]; -+#else - int f_spare[6]; -+#endif -+ - }; - - struct target_dirent { -@@ -2223,7 +2230,12 @@ struct target_statfs { - /* Linux specials */ - target_fsid_t f_fsid; - int32_t f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[5]; -+#else - int32_t f_spare[6]; -+#endif - }; - #else - struct target_statfs { -@@ -2239,7 +2251,12 @@ struct target_statfs { - /* Linux specials */ - target_fsid_t f_fsid; - abi_long f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[5]; -+#else - abi_long f_spare[6]; -+#endif - }; - #endif - -@@ -2255,7 +2272,12 @@ struct target_statfs64 { - uint64_t f_bavail; - target_fsid_t f_fsid; - uint32_t f_namelen; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[5]; -+#else - uint32_t f_spare[6]; -+#endif - }; - #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \ - defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \ -@@ -2271,7 +2293,12 @@ struct target_statfs { - target_fsid_t f_fsid; - abi_long f_namelen; - abi_long f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[4]; -+#else - abi_long f_spare[5]; -+#endif - }; - - struct target_statfs64 { -@@ -2285,7 +2312,12 @@ struct target_statfs64 { - target_fsid_t f_fsid; - abi_long f_namelen; - abi_long f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ abi_long f_flags; -+ abi_long f_spare[4]; -+#else - abi_long f_spare[5]; -+#endif - }; - #elif defined(TARGET_S390X) - struct target_statfs { -@@ -2299,7 +2331,13 @@ struct target_statfs { - kernel_fsid_t f_fsid; - int32_t f_namelen; - int32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[4]; -+#else - int32_t f_spare[5]; -+#endif -+ - }; - - struct target_statfs64 { -@@ -2313,7 +2351,12 @@ struct target_statfs64 { - kernel_fsid_t f_fsid; - int32_t f_namelen; - int32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ int32_t f_flags; -+ int32_t f_spare[4]; -+#else - int32_t f_spare[5]; -+#endif - }; - #else - struct target_statfs { -@@ -2327,7 +2370,12 @@ struct target_statfs { - target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[4]; -+#else - uint32_t f_spare[5]; -+#endif - }; - - struct target_statfs64 { -@@ -2341,7 +2389,12 @@ struct target_statfs64 { - target_fsid_t f_fsid; - uint32_t f_namelen; - uint32_t f_frsize; -+#ifdef HAVE_STATFS_FLAGS -+ uint32_t f_flags; -+ uint32_t f_spare[4]; -+#else - uint32_t f_spare[5]; -+#endif - }; - #endif - diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index c027541c01c1..25c19cd79c7f 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.17.0"; + version = "0.18.0"; name = "tini-${version}"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0"; + sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index c494ee266be3..0538228d4b4e 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l"; + sha256 = "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; homepage = https://github.com/baskerville/bspwm; - maintainers = with maintainers; [ meisternu epitrochoid ]; + maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 46c87b0b189e..986639c947b0 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager"; - homepage = "http://i3wm.org"; + homepage = "https://i3wm.org"; maintainers = with maintainers; [ garbas modulistic fpletz ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index b54f6e8def33..fa964e86974b 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A tiling window manager"; - homepage = http://i3wm.org; + homepage = https://i3wm.org; maintainers = [ stdenv.lib.maintainers.garbas ]; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; |